diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java index 3b0bbb4562..7a45eeded1 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java @@ -67,6 +67,7 @@ import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionName; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; +import com.google.devtools.common.options.OptionsClassProvider; import java.io.PrintStream; import java.util.ArrayList; import java.util.Collection; @@ -266,11 +267,12 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { String defaultsPackageContents, UUID commandId, Map<String, String> clientEnv, - TimestampGranularityMonitor tsgm) + TimestampGranularityMonitor tsgm, + OptionsClassProvider options) throws InterruptedException, AbruptExitException { super.sync(eventHandler, packageCacheOptions, outputBase, workingDirectory, - defaultsPackageContents, commandId, clientEnv, tsgm); - handleDiffs(eventHandler, packageCacheOptions.checkOutputFiles); + defaultsPackageContents, commandId, clientEnv, tsgm, options); + handleDiffs(eventHandler, packageCacheOptions.checkOutputFiles, options); } /** @@ -325,11 +327,12 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { */ @VisibleForTesting public void handleDiffs(EventHandler eventHandler) throws InterruptedException { - handleDiffs(eventHandler, /*checkOutputFiles=*/ false); + handleDiffs(eventHandler, /*checkOutputFiles=*/false, OptionsClassProvider.EMPTY); } - private void handleDiffs(EventHandler eventHandler, boolean checkOutputFiles) - throws InterruptedException { + private void handleDiffs( + EventHandler eventHandler, boolean checkOutputFiles, OptionsClassProvider options) + throws InterruptedException { if (lastAnalysisDiscarded) { // Values were cleared last build, but they couldn't be deleted because they were needed for // the execution phase. We can delete them now. @@ -344,7 +347,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { pathEntriesWithoutDiffInformation = Sets.newHashSet(); for (Path pathEntry : pkgLocator.get().getPathEntries()) { DiffAwarenessManager.ProcessableModifiedFileSet modifiedFileSet = - diffAwarenessManager.getDiff(eventHandler, pathEntry); + diffAwarenessManager.getDiff(eventHandler, pathEntry, options); if (modifiedFileSet.getModifiedFileSet().treatEverythingAsModified()) { pathEntriesWithoutDiffInformation.add(Pair.of(pathEntry, modifiedFileSet)); } else { |