aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
diff options
context:
space:
mode:
authorGravatar rduan <rduan@google.com>2017-07-20 22:17:42 +0200
committerGravatar Klaus Aehlig <aehlig@google.com>2017-07-21 09:15:27 +0200
commitc003cc2c1d40784cfa24c77388c72ca6bf056592 (patch)
treeb4f2661556f63fff6787df017b113e3a5ef5cf31 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
parent3476c6d88a1ab81e1618b3dc76ca0eb01e4c3246 (diff)
Add all generated headers as mandatory inputs for compile actions.
We previously only add those under genfiles root. But J2ObjC and objc proto headers are under the bin root, which we may also fix in the near future. RELNOTES: None. PiperOrigin-RevId: 162656166
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
index 51d4c7c9a6..30b9710604 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
@@ -112,10 +112,8 @@ public class ObjcCppSemantics implements CppSemantics {
// TODO(b/62060839): Identify the mechanism used to add generated headers in c++, and recycle
// it here.
- PathFragment genfilesSegment =
- ruleContext.getConfiguration().getGenfilesDirectory().getExecPath().getLastSegment();
for (Artifact header : objcProvider.get(HEADER)) {
- if (genfilesSegment.equals(header.getRoot().getExecPath().getLastSegment())) {
+ if (!header.isSourceArtifact()) {
generatedHeaders.add(header);
}
}