diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-19 20:05:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-19 20:05:20 +0000 |
| commit | 0816d189919016880f36262e36b3a11407ead2b1 (patch) | |
| tree | 34f42e05de89c57c8dd268f329e3ecb6625b2161 /src/google/protobuf/compiler/javanano/javanano_generator.cc | |
| parent | f1c606d95efbfdb7a028dff14f9e8773d30a63b4 (diff) | |
| parent | 72b0f4cfbb910909f953c52ba7d097a6b3904cbb (diff) | |
| download | external_protobuf-0816d189919016880f36262e36b3a11407ead2b1.zip external_protobuf-0816d189919016880f36262e36b3a11407ead2b1.tar.gz external_protobuf-0816d189919016880f36262e36b3a11407ead2b1.tar.bz2 | |
am 72b0f4cf: Merge "Generate @IntDef annotations for nanoproto enums."
* commit '72b0f4cfbb910909f953c52ba7d097a6b3904cbb':
Generate @IntDef annotations for nanoproto enums.
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_generator.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_generator.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc index 9ca06cd..96e3e80 100644 --- a/src/google/protobuf/compiler/javanano/javanano_generator.cc +++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc @@ -154,6 +154,8 @@ bool JavaNanoGenerator::Generate(const FileDescriptor* file, params.set_parcelable_messages(option_value == "true"); } else if (option_name == "generate_clone") { params.set_generate_clone(option_value == "true"); + } else if (option_name == "generate_intdefs") { + params.set_generate_intdefs(option_value == "true"); } else { *error = "Ignore unknown javanano generator option: " + option_name; } |