aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar cpeyser <cpeyser@google.com>2018-01-25 11:17:43 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-01-25 11:19:20 -0800
commiteb0150b5e3b95d011e99e6f531c962831beaa109 (patch)
treea7df9ac418534e89c05b321764e85c51bbf40f14 /src/main
parentffaef29064dededa522b82715f35e2f190417d58 (diff)
Move .includes files, which are required for include scanning, out of the
includes output directory, which is wiped for every symlink action. Instead, put .includes files in genfiles. TESTED=manually using repro instructions in b/64534488#comment15 PiperOrigin-RevId: 183268700
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index b8b54cb1b2..77aa67593e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -616,9 +616,8 @@ public class CppHelper {
private static Artifact getIncludesOutput(RuleContext ruleContext, Artifact src) {
Preconditions.checkArgument(!src.isSourceArtifact(), src);
- return ruleContext.getShareableArtifact(
- src.getRootRelativePath().replaceName(src.getFilename() + GREPPED_INCLUDES_SUFFIX),
- src.getRoot());
+ return ruleContext.getGenfilesArtifact(
+ src.getRootRelativePath().replaceName(src.getFilename() + GREPPED_INCLUDES_SUFFIX));
}
/**