diff options
author | 2015-08-21 11:42:27 -0700 | |
---|---|---|
committer | 2015-08-21 11:44:49 -0700 | |
commit | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (patch) | |
tree | 195d74745dad40a57d49bf718f50c7751336a405 /src/google/protobuf/descriptor.proto | |
parent | b0f661181d10bddc08e380992590a1cdd92be92b (diff) | |
parent | eb65c69e14fb711208ad5111cb9672f00864bb6d (diff) |
Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
Diffstat (limited to 'src/google/protobuf/descriptor.proto')
-rw-r--r-- | src/google/protobuf/descriptor.proto | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index 13f136cb..9d3dd8fb 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -42,8 +42,9 @@ syntax = "proto2"; package google.protobuf; option go_package = "descriptor"; option java_package = "com.google.protobuf"; +option javanano_use_deprecated_package = true; option java_outer_classname = "DescriptorProtos"; -option csharp_namespace = "Google.ProtocolBuffers.DescriptorProtos"; +option csharp_namespace = "Google.Protobuf.Reflection"; option objc_class_prefix = "GPB"; // descriptor.proto must be optimized for speed because reflection-based @@ -369,6 +370,10 @@ message FileOptions { // Namespace for generated classes; defaults to the package. optional string csharp_namespace = 37; + // Whether the nano proto compiler should generate in the deprecated non-nano + // suffixed package. + optional bool javanano_use_deprecated_package = 38; + // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; |