From 0127c8c43e9ee3138292b6df1b04ac0dff3280aa Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 22 Jul 2026 21:23:55 -0700 Subject: [PATCH] Internal change PiperOrigin-RevId: 952503819 --- conformance/BUILD | 3 +++ conformance/binary_json_conformance_suite.cc | 2 ++ conformance/conformance_test.cc | 2 ++ conformance/conformance_test_runner.cc | 1 + conformance/naming_test.cc | 1 + conformance/testee_test.cc | 2 +- conformance/text_format_conformance_suite.cc | 2 ++ 7 files changed, 12 insertions(+), 1 deletion(-) diff --git a/conformance/BUILD b/conformance/BUILD index b6bbbc4cdeec9..862ec6f35fc1b 100644 --- a/conformance/BUILD +++ b/conformance/BUILD @@ -163,6 +163,7 @@ cc_library( srcs = ["text_format_conformance_suite.cc"], hdrs = ["text_format_conformance_suite.h"], deps = [ + ":conformance_cc_proto", ":conformance_test_lib", "//:test_messages_proto2_cc_proto", "//:test_messages_proto3_cc_proto", @@ -247,6 +248,7 @@ cc_test( name = "naming_test", srcs = ["naming_test.cc"], deps = [ + ":conformance_cc_proto", ":naming", "//:test_messages_proto2_cc_proto", "//:test_messages_proto3_cc_proto", @@ -283,6 +285,7 @@ cc_test( srcs = ["testee_test.cc"], deps = [ ":binary_wireformat", + ":conformance_cc_proto", ":test_runner", ":testee", "//:test_messages_proto2_cc_proto", diff --git a/conformance/binary_json_conformance_suite.cc b/conformance/binary_json_conformance_suite.cc index dcf04e988a53f..9a281aae3d20d 100644 --- a/conformance/binary_json_conformance_suite.cc +++ b/conformance/binary_json_conformance_suite.cc @@ -16,7 +16,9 @@ #include #include #include +#include +#include "google/protobuf/descriptor.pb.h" #include "absl/log/absl_check.h" #include "absl/log/absl_log.h" #include "absl/log/die_if_null.h" diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index 6ad403486787c..e5957c4c530a2 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -18,6 +18,7 @@ #include #include +#include "google/protobuf/descriptor.pb.h" #include "absl/container/btree_map.h" #include "absl/container/flat_hash_set.h" #include "absl/log/absl_check.h" @@ -28,6 +29,7 @@ #include "absl/strings/string_view.h" #include "conformance/conformance.pb.h" #include "failure_list_trie_node.h" +#include "test_runner.h" #include "google/protobuf/descriptor_legacy.h" #include "google/protobuf/endian.h" #include "google/protobuf/message.h" diff --git a/conformance/conformance_test_runner.cc b/conformance/conformance_test_runner.cc index a28862bb6131c..bda9b340ed567 100644 --- a/conformance/conformance_test_runner.cc +++ b/conformance/conformance_test_runner.cc @@ -45,6 +45,7 @@ #include #include +#include "google/protobuf/descriptor.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/ascii.h" #include "absl/strings/str_cat.h" diff --git a/conformance/naming_test.cc b/conformance/naming_test.cc index 75e366b7a653f..a9d3441e7d848 100644 --- a/conformance/naming_test.cc +++ b/conformance/naming_test.cc @@ -1,6 +1,7 @@ #include "naming.h" #include +#include "conformance/conformance.pb.h" #include "conformance/test_protos/test_messages_edition2023.pb.h" #include "conformance/test_protos/test_messages_edition_unstable.pb.h" #include "editions/golden/test_messages_proto2_editions.pb.h" diff --git a/conformance/testee_test.cc b/conformance/testee_test.cc index cf02463ed5c5c..0bb8b60541dc1 100644 --- a/conformance/testee_test.cc +++ b/conformance/testee_test.cc @@ -7,9 +7,9 @@ #include "absl/log/absl_check.h" #include "absl/strings/string_view.h" #include "binary_wireformat.h" +#include "conformance/conformance.pb.h" #include "test_runner.h" #include "google/protobuf/test_messages_proto2.pb.h" -#include "google/protobuf/test_messages_proto3.pb.h" #include "google/protobuf/test_textproto.h" #include "google/protobuf/text_format.h" #include "google/protobuf/util/message_differencer.h" diff --git a/conformance/text_format_conformance_suite.cc b/conformance/text_format_conformance_suite.cc index 89b8d18d453d9..d00c2f5b90832 100644 --- a/conformance/text_format_conformance_suite.cc +++ b/conformance/text_format_conformance_suite.cc @@ -12,10 +12,12 @@ #include #include +#include "google/protobuf/descriptor.pb.h" #include "absl/log/absl_log.h" #include "absl/log/die_if_null.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" +#include "conformance/conformance.pb.h" #include "conformance_test.h" #include "conformance/test_protos/test_messages_edition2023.pb.h" #include "conformance/test_protos/test_messages_edition_unstable.pb.h"