aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java
diff options
context:
space:
mode:
authorGravatar Rumou Duan <rduan@google.com>2016-04-25 17:55:12 +0000
committerGravatar Yun Peng <pcloudy@google.com>2016-04-26 08:29:19 +0000
commit33bab46ae38ef0dec7914bb4ca7b733a9feb435c (patch)
tree5d10b6610a56bf8414313d842850026369264fcb /src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java
parentd9121976fa7b39372027c70edddf9eb3c0bba7a6 (diff)
Split ActionMetadata into ActionAnalysisMetadata and ActionExecutionMetadata.
Except in action execution logic (ActionExecutionFunction, SkyframeActionExecutor, etc.), switch Action interface references to either ActionAnalysisMetadata if possible or ActionExecutionMetadata. -- MOS_MIGRATED_REVID=120723431
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java
index 3918bf7d09..7f32c1e19b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java
@@ -16,7 +16,7 @@ package com.google.devtools.build.lib.skyframe;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
-import com.google.devtools.build.lib.actions.Action;
+import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -46,12 +46,13 @@ public final class ConfiguredTargetValue extends ActionLookupValue {
// We overload this variable to check whether the value has been clear()ed. We don't use a
// separate variable in order to save memory.
- @Nullable private volatile Iterable<Action> actions;
+ @Nullable private volatile Iterable<ActionAnalysisMetadata> actions;
private final NestedSet<Package> transitivePackages;
ConfiguredTargetValue(ConfiguredTarget configuredTarget,
- Map<Artifact, Action> generatingActionMap, NestedSet<Package> transitivePackages) {
+ Map<Artifact, ActionAnalysisMetadata> generatingActionMap,
+ NestedSet<Package> transitivePackages) {
super(generatingActionMap);
this.configuredTarget = configuredTarget;
this.actions = generatingActionMap.values();
@@ -65,7 +66,7 @@ public final class ConfiguredTargetValue extends ActionLookupValue {
}
@VisibleForTesting
- public Iterable<Action> getActions() {
+ public Iterable<ActionAnalysisMetadata> getActions() {
return Preconditions.checkNotNull(actions, configuredTarget);
}