aboutsummaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/compiler/plugin.proto
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2015-01-15 22:48:58 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-15 22:48:58 +0000
commit77a6b2f4cdd580d57630f079db1d908d7fd90a54 (patch)
tree586f7d5e9a7e05af45d0e821188097c0faa96219 /src/google/protobuf/compiler/plugin.proto
parentc7c25812eb19d080087b71e08bfe35aff9f21433 (diff)
parenta3b2a6da25a76f17c73d31def3952feb0fd2296e (diff)
downloadexternal_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.zip
external_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.tar.gz
external_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.tar.bz2
Merge "Update protobuf library from 2.3 to 2.6."
Diffstat (limited to 'src/google/protobuf/compiler/plugin.proto')
-rw-r--r--src/google/protobuf/compiler/plugin.proto4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/plugin.proto b/src/google/protobuf/compiler/plugin.proto
index 4e928b0..77b888f 100644
--- a/src/google/protobuf/compiler/plugin.proto
+++ b/src/google/protobuf/compiler/plugin.proto
@@ -45,6 +45,8 @@
// flag "--${NAME}_out" is passed to protoc.
package google.protobuf.compiler;
+option java_package = "com.google.protobuf.compiler";
+option java_outer_classname = "PluginProtos";
import "google/protobuf/descriptor.proto";
@@ -131,7 +133,7 @@ message CodeGeneratorResponse {
// in order to work correctly in that context.
//
// The code generator that generates the initial file and the one which
- // inserts into it must both run as part of a single invocatino of protoc.
+ // inserts into it must both run as part of a single invocation of protoc.
// Code generators are executed in the order in which they appear on the
// command line.
//