diff options
author | hlopko <hlopko@google.com> | 2018-06-15 09:10:05 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-15 09:11:41 -0700 |
commit | 8820d3ae601f229b72c61d2eb601b0e8e9b0111a (patch) | |
tree | 02caa729cae33cb2414cbda033313705cf0278b9 /src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java | |
parent | b36470e6e0073a76012afbed7ba9cf9c32ef002c (diff) |
Remove LIPO support
RELNOTES: Support for LIPO has been fully removed.
PiperOrigin-RevId: 200724578
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java index 8a3faea0a3..c5b411c881 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java @@ -69,16 +69,6 @@ public class CachingAnalysisEnvironment implements AnalysisEnvironment { private final boolean isSystemEnv; private final boolean extendedSanityChecks; - /** - * If false, no actions will be registered, they'll all be just dropped. - * - * <p>Usually, an analysis environment should register all actions. However, in some scenarios we - * analyze some targets twice, but the first one only serves the purpose of collecting information - * for the second analysis. In this case we don't register actions created by the first pass in - * order to avoid action conflicts. - */ - private final boolean allowRegisteringActions; - private final ActionKeyContext actionKeyContext; private boolean enabled = true; @@ -100,8 +90,7 @@ public class CachingAnalysisEnvironment implements AnalysisEnvironment { boolean isSystemEnv, boolean extendedSanityChecks, ExtendedEventHandler errorEventListener, - SkyFunction.Environment env, - boolean allowRegisteringActions) { + SkyFunction.Environment env) { this.artifactFactory = artifactFactory; this.actionKeyContext = actionKeyContext; this.owner = Preconditions.checkNotNull(owner); @@ -109,13 +98,12 @@ public class CachingAnalysisEnvironment implements AnalysisEnvironment { this.extendedSanityChecks = extendedSanityChecks; this.errorEventListener = errorEventListener; this.skyframeEnv = env; - this.allowRegisteringActions = allowRegisteringActions; middlemanFactory = new MiddlemanFactory(artifactFactory, this); artifacts = new HashMap<>(); } public void disable(Target target) { - if (!hasErrors() && allowRegisteringActions) { + if (!hasErrors()) { verifyGeneratedArtifactHaveActions(target); } artifacts = null; @@ -163,18 +151,11 @@ public class CachingAnalysisEnvironment implements AnalysisEnvironment { @Override public ImmutableSet<Artifact> getOrphanArtifacts() { - if (!allowRegisteringActions) { - return ImmutableSet.of(); - } return ImmutableSet.copyOf(getOrphanArtifactMap().keySet()); } @Override public ImmutableSet<Artifact> getTreeArtifactsConflictingWithFiles() { - if (!allowRegisteringActions) { - return ImmutableSet.of(); - } - boolean hasTreeArtifacts = false; for (Artifact artifact : artifacts.keySet()) { if (artifact.isTreeArtifact()) { @@ -300,14 +281,11 @@ public class CachingAnalysisEnvironment implements AnalysisEnvironment { @Override public void registerAction(ActionAnalysisMetadata... actions) { Preconditions.checkState(enabled); - if (allowRegisteringActions) { - Collections.addAll(this.actions, actions); - } + Collections.addAll(this.actions, actions); } @Override public ActionAnalysisMetadata getLocalGeneratingAction(Artifact artifact) { - Preconditions.checkState(allowRegisteringActions); for (ActionAnalysisMetadata action : actions) { if (action.getOutputs().contains(artifact)) { return action; |