diff options
| author |  janakr <janakr@google.com> | 2018-03-27 15:24:09 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-27 15:25:33 -0700 |
| commit | 7292497d51ab20fdff74252de58a14fddb5276ee (patch) | |
| tree | b0e10c98f2b276c3298c0b80b53aad652d771aba /src/main/java/com/google/devtools/build/lib/analysis | |
| parent | 5542ef30560f8d39e3b4f2c0912cc3b67905ed6e (diff) | |
Get rid of all remaining non-test non-internal uses of ConfiguredTarget#getConfiguration(). Add convenience methods in four Java test classes for use by refactoring tools to do this#getConfiguration(ConfiguredTarget) instead of ConfiguredTarget#getConfiguration.
PiperOrigin-RevId: 190684008
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/BuildView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index cd94353556..fb283ae746 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -1210,7 +1210,8 @@ public class BuildView { BuildConfigurationCollection configurations) throws EvalException, InvalidConfigurationException, InterruptedException, InconsistentAspectOrderException, ToolchainContextException { - BuildConfiguration targetConfig = target.getConfiguration(); + BuildConfiguration targetConfig = + skyframeExecutor.getConfiguration(eventHandler, target.getConfigurationKey()); CachingAnalysisEnvironment env = new CachingAnalysisEnvironment( getArtifactFactory(), @@ -1236,7 +1237,8 @@ public class BuildView { BuildConfigurationCollection configurations) throws EvalException, InvalidConfigurationException, InterruptedException, InconsistentAspectOrderException, ToolchainContextException { - BuildConfiguration targetConfig = configuredTarget.getConfiguration(); + BuildConfiguration targetConfig = + skyframeExecutor.getConfiguration(eventHandler, configuredTarget.getConfigurationKey()); Target target = null; try { target = |