diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:39:59 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:39:59 -0700 |
| commit | 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 (patch) | |
| tree | 7d2ec154f15c9f9153d890e76b6cf30e471ea488 /src/google/protobuf/compiler/javanano/javanano_generator.cc | |
| parent | 78105897a8f01c7be9cf8502b6c58d47eb1ccdd7 (diff) | |
Integrate google internal changes.
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_generator.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_generator.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc index a33eba1b..a342e6bb 100644 --- a/src/google/protobuf/compiler/javanano/javanano_generator.cc +++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc @@ -68,12 +68,7 @@ void UpdateParamsRecursively(Params& params, } if (file->options().has_java_package()) { string result = file->options().java_package(); - if (!file->options().javanano_use_deprecated_package()) { - if (!result.empty()) { - result += "."; - } - result += "nano"; - } + result += "nano"; params.set_java_package( file->name(), result); } |