diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java index cc552eb1ca..d53d37dc47 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java @@ -419,15 +419,8 @@ final class ProtoSupport { } private ImmutableList<Artifact> getGeneratedHeaders() { - ImmutableList.Builder<Artifact> headers = new ImmutableList.Builder<>(); - headers.addAll(generatedOutputArtifacts(FileType.of(".pbobjc.h"))); - if (!usesProtobufLibrary()) { - // As part of the compatibility layer between PB2 and protobuf, PB2 generates both pb.h and - // pbobjc.h files, easing the migration out of PB2. - headers.addAll(generatedOutputArtifacts(FileType.of(".pb.h"))); - } - - return headers.build(); + boolean useObjcName = attributes.usesObjcHeaderNames() || usesProtobufLibrary(); + return generatedOutputArtifacts(FileType.of(".pb" + (useObjcName ? "objc.h" : ".h"))); } private ImmutableList<Artifact> getGeneratedSources() { |