From 940fbd7aafc8227a5ff110ddac1be71d17225adf Mon Sep 17 00:00:00 2001 From: ulfjack Date: Fri, 15 Jun 2018 03:23:58 -0700 Subject: Add the BuildConfigurationCollection to the AnalysisResult This is in preparation for interleaving config creation with loading+analysis. PiperOrigin-RevId: 200695071 --- .../com/google/devtools/build/lib/analysis/AnalysisResult.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java index 6239328a60..401551333b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java @@ -19,6 +19,7 @@ import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.ActionGraph; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.PackageRoots; +import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection; import com.google.devtools.build.lib.skyframe.AspectValue; import java.util.Collection; import java.util.List; @@ -28,6 +29,7 @@ import javax.annotation.Nullable; * Return value for {@link com.google.devtools.build.lib.buildtool.AnalysisPhaseRunner}. */ public final class AnalysisResult { + private final BuildConfigurationCollection configurations; private final ImmutableSet targetsToBuild; @Nullable private final ImmutableList targetsToTest; private final ImmutableSet targetsToSkip; @@ -43,6 +45,7 @@ public final class AnalysisResult { private final List topLevelTargetsWithConfigs; AnalysisResult( + BuildConfigurationCollection configurations, Collection targetsToBuild, ImmutableSet aspects, Collection targetsToTest, @@ -56,6 +59,7 @@ public final class AnalysisResult { PackageRoots packageRoots, String workspaceName, List topLevelTargetsWithConfigs) { + this.configurations = configurations; this.targetsToBuild = ImmutableSet.copyOf(targetsToBuild); this.aspects = aspects; this.targetsToTest = targetsToTest == null ? null : ImmutableList.copyOf(targetsToTest); @@ -71,6 +75,10 @@ public final class AnalysisResult { this.topLevelTargetsWithConfigs = topLevelTargetsWithConfigs; } + public BuildConfigurationCollection getConfigurationCollection() { + return configurations; + } + /** * Returns configured targets to build. */ -- cgit v1.2.3