aboutsummaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/compiler/javanano/javanano_generator.cc
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2015-02-19 19:56:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-19 19:56:07 +0000
commit72b0f4cfbb910909f953c52ba7d097a6b3904cbb (patch)
tree47cd1118e63974e416cb198ccd39110943b97dd7 /src/google/protobuf/compiler/javanano/javanano_generator.cc
parent971aedc78cbafac28e521808710574803708202f (diff)
parent30d873bd66f50a6021de5d44d7ee5b8a809b0524 (diff)
downloadexternal_protobuf-72b0f4cfbb910909f953c52ba7d097a6b3904cbb.zip
external_protobuf-72b0f4cfbb910909f953c52ba7d097a6b3904cbb.tar.gz
external_protobuf-72b0f4cfbb910909f953c52ba7d097a6b3904cbb.tar.bz2
Merge "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.cc2
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;
}