diff options
Diffstat (limited to 'src/google/protobuf/compiler/javamicro/javamicro_generator.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javamicro/javamicro_generator.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/google/protobuf/compiler/javamicro/javamicro_generator.cc b/src/google/protobuf/compiler/javamicro/javamicro_generator.cc index bfba8c5..4643899 100644 --- a/src/google/protobuf/compiler/javamicro/javamicro_generator.cc +++ b/src/google/protobuf/compiler/javamicro/javamicro_generator.cc @@ -57,6 +57,10 @@ void UpdateParamsRecursively(Params& params, params.set_java_package( file->name(), file->options().java_package()); } + if (file->options().has_java_multiple_files()) { + params.set_java_multiple_files( + file->name(), file->options().java_multiple_files()); + } // Loop through all dependent files recursively // adding dep @@ -89,11 +93,6 @@ bool JavaMicroGenerator::Generate(const FileDescriptor* file, string output_list_file; Params params(file->name()); - // Get options from the proto file - if (file->options().has_java_multiple_files()) { - params.set_java_multiple_files(file->options().java_multiple_files()); - } - // Update per file params UpdateParamsRecursively(params, file); @@ -133,7 +132,7 @@ bool JavaMicroGenerator::Generate(const FileDescriptor* file, } params.set_java_outer_classname(parts[0], parts[1]); } else if (options[i].first == "java_multiple_files") { - params.set_java_multiple_files(options[i].second == "true"); + params.set_override_java_multiple_files(options[i].second == "true"); } else if (options[i].first == "java_use_vector") { params.set_java_use_vector(options[i].second == "true"); } else { |