diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2017-03-27 12:04:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-27 12:04:08 -0700 |
| commit | d9e0119f2c2f49ea89012a03c030e2b5011d0bc3 (patch) | |
| tree | faac429bb401bf05d7ba57da5423f9b9816cc433 | |
| parent | c565e25c7d5f2265b103d78b3796bb8822d6c1b5 (diff) | |
| parent | 0df20284d03f3d313268d672be61beee6cc8873d (diff) | |
| download | protobuf-d9e0119f2c2f49ea89012a03c030e2b5011d0bc3.tar.gz protobuf-d9e0119f2c2f49ea89012a03c030e2b5011d0bc3.tar.bz2 protobuf-d9e0119f2c2f49ea89012a03c030e2b5011d0bc3.zip | |
Merge pull request #2858 from haberman/gopackage
Changed go_package for plugin.proto.
| -rw-r--r-- | src/google/protobuf/compiler/plugin.pb.cc | 7 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/plugin.proto | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 4310ff1e..d044fbbe 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -164,11 +164,12 @@ void AddDescriptorsImpl() { "\t\022B\n\004file\030\017 \003(\01324.google.protobuf.compil" "er.CodeGeneratorResponse.File\032>\n\004File\022\014\n" "\004name\030\001 \001(\t\022\027\n\017insertion_point\030\002 \001(\t\022\017\n\007" - "content\030\017 \001(\tB7\n\034com.google.protobuf.com" - "pilerB\014PluginProtosZ\tplugin_go" + "content\030\017 \001(\tBg\n\034com.google.protobuf.com" + "pilerB\014PluginProtosZ9github.com/golang/p" + "rotobuf/protoc-gen-go/plugin;plugin_go" }; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - descriptor, 590); + descriptor, 638); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/compiler/plugin.proto", &protobuf_RegisterTypes); ::google::protobuf::protobuf_google_2fprotobuf_2fdescriptor_2eproto::AddDescriptors(); diff --git a/src/google/protobuf/compiler/plugin.proto b/src/google/protobuf/compiler/plugin.proto index 6e4da2c1..bf91d76e 100644 --- a/src/google/protobuf/compiler/plugin.proto +++ b/src/google/protobuf/compiler/plugin.proto @@ -49,7 +49,7 @@ package google.protobuf.compiler; option java_package = "com.google.protobuf.compiler"; option java_outer_classname = "PluginProtos"; -option go_package = "plugin_go"; +option go_package = "github.com/golang/protobuf/protoc-gen-go/plugin;plugin_go"; import "google/protobuf/descriptor.proto"; |