diff options
| author | Colin Cross <ccross@android.com> | 2018-10-11 11:14:12 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-09-05 14:44:01 -0700 |
| commit | 713550a705dbb3d7a1d3b28e52712c7b3803cc1f (patch) | |
| tree | a87a62b45aeffeda61fcff46ede5f5b210244e1a /src | |
| parent | 38461bbb3ed757e928e3e3b9a8025fc9316b522d (diff) | |
| download | protobuf-713550a705dbb3d7a1d3b28e52712c7b3803cc1f.tar.gz | |
Revert "Generate syntactically correct java for imports from classes with no packages."
This reverts commit 1ee0c0718b5cfeea7b5bf035c0c5405bbdb9fb88.
Replacing with merge from upstream.
Bug: 117607748
Test: m checkbuild
Change-Id: I95b4100be49f29eb5ff931716a74034466c78edd
Merged-In: I95b4100be49f29eb5ff931716a74034466c78edd
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_shared_code_generator.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/java/java_shared_code_generator.cc b/src/google/protobuf/compiler/java/java_shared_code_generator.cc index b5b503a59..74253c3fb 100644 --- a/src/google/protobuf/compiler/java/java_shared_code_generator.cc +++ b/src/google/protobuf/compiler/java/java_shared_code_generator.cc @@ -169,11 +169,9 @@ void SharedCodeGenerator::GenerateDescriptors(io::Printer* printer) { for (int i = 0; i < file_->dependency_count(); i++) { if (ShouldIncludeDependency(file_->dependency(i))) { string filename = file_->dependency(i)->name(); - string classname = FileJavaPackage(file_->dependency(i)); - if (!classname.empty()) { - classname += "."; - } - classname += name_resolver_->GetDescriptorClassName(file_->dependency(i)); + string classname = FileJavaPackage(file_->dependency(i)) + "." + + name_resolver_->GetDescriptorClassName( + file_->dependency(i)); dependencies.push_back(std::make_pair(filename, classname)); } } |