diff options
| author | Brian Duff <bduff@google.com> | 2015-03-20 19:13:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 19:13:32 +0000 |
| commit | 02bf18fe1646f69c0d704b2e2886d308dfdfed5d (patch) | |
| tree | 698e617f7ef835e6c8692ee09276509a07f80fb1 | |
| parent | bb555861ba1bbe274c0fdcca8029fb8dffee9914 (diff) | |
| parent | 51e32ffaa5e2ea3528a58db5d34e8a0dc0a9ac93 (diff) | |
| download | external_protobuf-02bf18fe1646f69c0d704b2e2886d308dfdfed5d.zip external_protobuf-02bf18fe1646f69c0d704b2e2886d308dfdfed5d.tar.gz external_protobuf-02bf18fe1646f69c0d704b2e2886d308dfdfed5d.tar.bz2 | |
am 51e32ffa: Merge "Expose generate_clear as an option."
* commit '51e32ffaa5e2ea3528a58db5d34e8a0dc0a9ac93':
Expose generate_clear as an option.
| -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 96e3e80..99ebe12 100644 --- a/src/google/protobuf/compiler/javanano/javanano_generator.cc +++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc @@ -156,6 +156,8 @@ bool JavaNanoGenerator::Generate(const FileDescriptor* file, params.set_generate_clone(option_value == "true"); } else if (option_name == "generate_intdefs") { params.set_generate_intdefs(option_value == "true"); + } else if (option_name == "generate_clear") { + params.set_generate_clear(option_value == "true"); } else { *error = "Ignore unknown javanano generator option: " + option_name; } |