diff options
| author |  Sergio Campama <kaipi@google.com> | 2016-05-27 16:10:42 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-05-30 09:19:12 +0000 |
| commit | c02ed17c095b99bef745707e5c8f523baa1805aa (patch) | |
| tree | e119c1e6ed726744e08d10fc5ced215ae28e1cce /src | |
| parent | befa57cb19870665ff9ffa951f1c076922f3fe19 (diff) | |
Removes the generated proto sources from the header list, as it conflicts with
module maps generation. This only affects protos generated using the new
protobuf library.
--
MOS_MIGRATED_REVID=123424524
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java | 7 |
1 files changed, 5 insertions, 2 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 7399509080..7d441ecd78 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 @@ -237,8 +237,11 @@ final class ProtoSupport { new CompilationArtifacts.Builder() .setIntermediateArtifacts(ObjcRuleClasses.intermediateArtifacts(ruleContext)) .setPchFile(Optional.<Artifact>absent()) - .addAdditionalHdrs(getGeneratedHeaders()) - .addAdditionalHdrs(generatedSources); + .addAdditionalHdrs(getGeneratedHeaders()); + + if (targetType == TargetType.PROTO_TARGET && !usesProtobufLibrary()) { + builder.addAdditionalHdrs(generatedSources); + } if (experimentalAutoUnion()) { if (targetType == TargetType.PROTO_TARGET && !usesProtobufLibrary() |