diff options
| author |  janakr <janakr@google.com> | 2018-01-18 07:45:12 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-18 07:47:19 -0800 |
| commit | f3e6f251d3823a826918ad762d1f69f84030ef8c (patch) | |
| tree | 6913889c0eeb17dcc51d81faf871abde9ea69c93 /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java | |
| parent | aad6304ad938cae6010c1d58f01d92a12a81ac1a (diff) | |
Start the process of getting Target out of ConfiguredTarget: add a new container, ConfiguredTargetAndTarget, that can be used to access Targets, and deprecate ConfiguredTarget#getTarget. ConfiguredAndTargetObjects are intended to be limited in scope, not being persisted to Skyframe.
The eventual plan is to remove the target field from ConfiguredTarget.
This CL is mostly straightforward, except for dealing with AliasConfiguredTargets, which cause some complications.
A significant cleanup is still needed before #getTarget can be removed, but I don't see any impossible blockers. We will may still need to store a Target-like object in ConfiguredTarget (that has the RuleClass, or at least a string representation of it, for instance), but that will let us avoid storing a full Target together with its associated Package.
PiperOrigin-RevId: 182371566
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java index d724a9093a..5d4e24aad7 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java @@ -500,7 +500,7 @@ public final class SkyframeBuildView { Target target, BuildConfiguration configuration, CachingAnalysisEnvironment analysisEnvironment, - OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap, + OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap, ImmutableMap<Label, ConfigMatchingProvider> configConditions, @Nullable ToolchainContext toolchainContext) throws InterruptedException { |