aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
diff options
context:
space:
mode:
authorGravatar tomlu <tomlu@google.com>2018-06-18 16:16:36 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-18 16:18:08 -0700
commit9e91f20bb31e44b4be836996ac9d91af61e1e822 (patch)
tree7e7c116290099ef5a8e16e67a9d4f5a0c908fbf9 /src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
parentd4406d644efcf86327834a56b01cc212389e52e7 (diff)
Remove support for --discard_actions_after_execution.
The memory savings from this flag are not worth the complexity, and it interferes with action restarting. RELNOTES: Remove support for --discard_actions_after_execution. PiperOrigin-RevId: 201077905
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index 24cd665d6b..de5db333d1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -15,7 +15,6 @@
package com.google.devtools.build.lib.skyframe;
import com.google.common.base.Preconditions;
-import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -102,7 +101,6 @@ import javax.annotation.Nullable;
public final class AspectFunction implements SkyFunction {
private final BuildViewProvider buildViewProvider;
private final RuleClassProvider ruleClassProvider;
- private final Supplier<Boolean> removeActionsAfterEvaluation;
private final BuildOptions defaultBuildOptions;
@Nullable SkylarkImportLookupFunction skylarkImportLookupFunctionForInlining;
/**
@@ -115,13 +113,11 @@ public final class AspectFunction implements SkyFunction {
AspectFunction(
BuildViewProvider buildViewProvider,
RuleClassProvider ruleClassProvider,
- Supplier<Boolean> removeActionsAfterEvaluation,
@Nullable SkylarkImportLookupFunction skylarkImportLookupFunctionForInlining,
boolean storeTransitivePackagesForPackageRootResolution,
BuildOptions defaultBuildOptions) {
this.buildViewProvider = buildViewProvider;
this.ruleClassProvider = ruleClassProvider;
- this.removeActionsAfterEvaluation = Preconditions.checkNotNull(removeActionsAfterEvaluation);
this.skylarkImportLookupFunctionForInlining = skylarkImportLookupFunctionForInlining;
this.storeTransitivePackagesForPackageRootResolution =
storeTransitivePackagesForPackageRootResolution;
@@ -578,8 +574,7 @@ public final class AspectFunction implements SkyFunction {
originalTarget.getLocation(),
ConfiguredAspect.forAlias(real.getConfiguredAspect()),
GeneratingActions.EMPTY,
- transitivePackagesForPackageRootResolution,
- removeActionsAfterEvaluation.get());
+ transitivePackagesForPackageRootResolution);
}
@Nullable
@@ -668,8 +663,7 @@ public final class AspectFunction implements SkyFunction {
generatingActions,
transitivePackagesForPackageRootResolution == null
? null
- : transitivePackagesForPackageRootResolution.build(),
- removeActionsAfterEvaluation.get());
+ : transitivePackagesForPackageRootResolution.build());
}
@Override