aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/runtime
diff options
context:
space:
mode:
authorGravatar janakr <janakr@google.com>2018-03-27 15:24:09 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-03-27 15:25:33 -0700
commit7292497d51ab20fdff74252de58a14fddb5276ee (patch)
treeb0e10c98f2b276c3298c0b80b53aad652d771aba /src/main/java/com/google/devtools/build/lib/runtime
parent5542ef30560f8d39e3b4f2c0912cc3b67905ed6e (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/runtime')
-rw-r--r--src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java6
1 files changed, 5 insertions, 1 deletions
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");