aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/runtime/commands
diff options
context:
space:
mode:
authorGravatar gregce <gregce@google.com>2017-07-05 17:23:27 -0400
committerGravatar John Cater <jcater@google.com>2017-07-06 07:13:56 -0400
commit599ab33cfe3a6b2ed1e18b617d4edd8cb80e3426 (patch)
tree926352accc47824970837f324d65bd52447b10b3 /src/main/java/com/google/devtools/build/lib/runtime/commands
parentb7af444a0709039c20e79760a5cd1b06a9ed8c57 (diff)
Create top-level configs dynamically: period.
Before this change, top-level configs were still built statically, then cloned into dynamic configs to run the actual build. After this change, no static configuration should ever be created in a dynamically configured build. We're still keeping support for --experimental_dynamic_configs=off a bit longer to provide easy reversion on any bad surprises. But barring that we'll quickly move toward making --experimental_dynamic_configs=off a no-op, then ripping out Bazel's static configuration logic. PiperOrigin-RevId: 161005150
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime/commands')
-rw-r--r--src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
index 802d18c1d9..134b531e00 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
@@ -121,10 +121,9 @@ public class InfoCommand implements BlazeCommand {
env.setupPackageCache(
optionsProvider, runtime.getDefaultsPackageContent(optionsProvider));
// TODO(bazel-team): What if there are multiple configurations? [multi-config]
- configuration = env
- .getConfigurations(optionsProvider)
- .getTargetConfigurations().get(0);
- return configuration;
+ env.getSkyframeExecutor().setConfigurationFactory(runtime.getConfigurationFactory());
+ return env.getSkyframeExecutor().getConfiguration(
+ env.getReporter(), runtime.createBuildOptions(optionsProvider));
} catch (InvalidConfigurationException e) {
env.getReporter().handle(Event.error(e.getMessage()));
throw new ExitCausingRuntimeException(ExitCode.COMMAND_LINE_ERROR);