diff options
| author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-07 19:03:12 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-07 19:03:12 +0000 |
| commit | 7db9c098df1c73c6b35c23519d53ec3f92315db9 (patch) | |
| tree | b9242cc9b11854fdec5fc8bf5c88afe1294be8b8 /src/google/protobuf/compiler/java/java_file.cc | |
| parent | 9efebb3294791c0a3e26540f6c4943475603f1a5 (diff) | |
| download | protobuf-7db9c098df1c73c6b35c23519d53ec3f92315db9.tar.gz protobuf-7db9c098df1c73c6b35c23519d53ec3f92315db9.tar.bz2 protobuf-7db9c098df1c73c6b35c23519d53ec3f92315db9.zip | |
change java compiler to only produce one java file
Diffstat (limited to 'src/google/protobuf/compiler/java/java_file.cc')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_file.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc index deec0e71..2d825f65 100644 --- a/src/google/protobuf/compiler/java/java_file.cc +++ b/src/google/protobuf/compiler/java/java_file.cc @@ -44,6 +44,7 @@ #include <google/protobuf/compiler/java/java_message.h> #include <google/protobuf/compiler/java/java_name_resolver.h> #include <google/protobuf/compiler/java/java_service.h> +#include <google/protobuf/compiler/java/java_shared_code_generator.h> #include <google/protobuf/compiler/code_generator.h> #include <google/protobuf/io/printer.h> #include <google/protobuf/io/zero_copy_stream.h> @@ -314,14 +315,13 @@ void FileGenerator::GenerateDescriptorInitializationCodeForImmutable( " getDescriptor() {\n" " return descriptor;\n" "}\n" - "private static com.google.protobuf.Descriptors.FileDescriptor\n" + "public static com.google.protobuf.Descriptors.FileDescriptor\n" " descriptor;\n" "static {\n"); printer->Indent(); - printer->Print( - "descriptor = $descriptor_classname$.descriptor;\n", - "descriptor_classname", name_resolver_->GetDescriptorClassName(file_)); + SharedCodeGenerator shared_code_generator(file_); + shared_code_generator.GenerateDescriptors(printer); for (int i = 0; i < file_->message_type_count(); i++) { message_generators_[i]->GenerateStaticVariableInitializers(printer); |