aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
diff options
context:
space:
mode:
authorGravatar Nathan Harmata <nharmata@google.com>2016-03-25 08:02:42 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-03-25 22:00:41 +0000
commit6010883936381fd1fbc5fa41ade3e51e37da8b05 (patch)
tree77506664436e5904e62c89f79be1c9212a29d5c5 /src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
parentffec352154ac1660c9a933756bfc750d1367ad64 (diff)
Respect --noexperimental_check_output_files in FileSystemValueChecker. FileStateValues for output files can make their way into the Skyframe graph if a source file is symlink to an output file.
Also fix a bug where ExternalFilesHelper#isExternalFileSeen would always return true after returning true once in the past. This meant if an external file ever made its way into the Skyframe graph, we would always do a full graph scan at the beginning of each build (iow, we would always waste some CPU time doing nothing interesting). -- MOS_MIGRATED_REVID=118190190
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 5e1cae3e77..da3bdadcef 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -686,7 +686,8 @@ public class ExecutionTool {
new ActionCacheChecker(actionCache, env.getView().getArtifactFactory(), executionFilter,
verboseExplanations),
keepGoing, actualJobs,
- options.checkOutputFiles ? modifiedOutputFiles : ModifiedFileSet.NOTHING_MODIFIED,
+ request.getPackageCacheOptions().checkOutputFiles
+ ? modifiedOutputFiles : ModifiedFileSet.NOTHING_MODIFIED,
options.finalizeActions, fileCache, request.getBuildOptions().progressReportInterval);
}