diff options
author | 2018-03-27 15:24:09 -0700 | |
---|---|---|
committer | 2018-03-27 15:25:33 -0700 | |
commit | 7292497d51ab20fdff74252de58a14fddb5276ee (patch) | |
tree | b0e10c98f2b276c3298c0b80b53aad652d771aba /src/main/java/com | |
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')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/BuildView.java | 6 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java | 6 |
2 files changed, 9 insertions, 3 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 = diff --git a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java index b18a062d6a..8c8aa087a9 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java @@ -20,6 +20,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.ConfiguredTarget; +import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.test.TestConfiguration.TestOptions; import com.google.devtools.build.lib.buildtool.BuildRequest; import com.google.devtools.build.lib.buildtool.BuildResult; @@ -243,8 +244,11 @@ public class MobileInstallCommand implements BlazeCommand { List<String> cmdLine = new ArrayList<>(); // TODO(bazel-team): Get the executable path from the filesToRun provider from the aspect. + BuildConfiguration configuration = + env.getSkyframeExecutor() + .getConfiguration(env.getReporter(), targetToRun.getConfigurationKey()); cmdLine.add( - targetToRun.getConfiguration().getBinFragment().getPathString() + configuration.getBinFragment().getPathString() + "/" + targetToRun.getLabel().toPathFragment().getPathString() + "_mi/launcher"); |