Integrate from Piper for C++, Java, and Python (#10455)
* Sync from Piper @469587494
PROTOBUF_SYNC_PIPER
* Fixing github SOT protoc builds
* Fixing typos from google
* Remove leaked util/hash reference
* Fixing bad python merge
* Fixing python C++ library order
diff --git a/conformance/BUILD.bazel b/conformance/BUILD.bazel
index d298601..0c37e15 100644
--- a/conformance/BUILD.bazel
+++ b/conformance/BUILD.bazel
@@ -155,6 +155,7 @@
":jsoncpp",
":test_messages_proto2_proto_cc",
":test_messages_proto3_proto_cc",
+ "@com_google_absl//absl/status",
],
)
@@ -190,6 +191,8 @@
"//:protobuf",
"//:test_messages_proto2_cc_proto",
"//:test_messages_proto3_cc_proto",
+ "@com_google_absl//absl/status",
+ "@com_google_absl//absl/status:statusor",
],
)