| Index: third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto
|
| diff --git a/third_party/protobuf/src/google/protobuf/util/internal/testdata/anys.proto b/third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto
|
| similarity index 75%
|
| copy from third_party/protobuf/src/google/protobuf/util/internal/testdata/anys.proto
|
| copy to third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto
|
| index 18c59cbb96308c72f0a1d432a2ef79d81fccbdb6..f9abe3ba5967d65fb2ca31fe5bb260ceeae9f7ff 100644
|
| --- a/third_party/protobuf/src/google/protobuf/util/internal/testdata/anys.proto
|
| +++ b/third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto
|
| @@ -1,6 +1,5 @@
|
| // Protocol Buffers - Google's data interchange format
|
| -// Copyright 2008 Google Inc. All rights reserved.
|
| -// https://developers.google.com/protocol-buffers/
|
| +// 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
|
| @@ -28,26 +27,23 @@
|
| // (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 Any serialization.
|
| -syntax = "proto3";
|
| +syntax = "proto2";
|
|
|
| -package google.protobuf.testing.anys;
|
| -option java_package = "com.google.protobuf.testing.anys";
|
| +package protobuf_unittest;
|
|
|
| -import "google/protobuf/any.proto";
|
| +import "google/protobuf/unittest.proto";
|
|
|
| -message AnyIn {
|
| - string something = 1;
|
| -}
|
| +import "unittest_extension_chain_b.proto";
|
| +import "unittest_extension_chain_c.proto";
|
|
|
| -message AnyOut {
|
| - google.protobuf.Any any = 1;
|
| -}
|
| +// 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 AnyM {
|
| - string foo = 1;
|
| +message ChainDMessage {
|
| + optional ChainBMessage b = 1;
|
| + optional ChainCMessage c = 2;
|
| }
|
|
|
| -service TestService {
|
| - rpc Call(AnyIn) returns (AnyOut);
|
| +extend TestAllExtensions {
|
| + optional int32 chain_d_extension = 10004;
|
| }
|
|
|