diff options
| author |  Ulf Adams <ulfjack@google.com> | 2016-04-15 07:54:24 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-04-15 11:11:08 +0000 |
| commit | f069d45bfa5f311ba1a908887df1826ec52c7a31 (patch) | |
| tree | 5d27dce73d22f767fe02582caadd956c3310bc35 /src/main/java/com/google/devtools/build/lib/buildtool | |
| parent | 0ea57e6983238cbc84ab62f8197912ccab215c93 (diff) | |
Inject the BlazeDirectories in SkyframeExecutor.
The BlazeDirectories are also needed for loading the WORKSPACE file, so inject
them as part of preparePackageLoading rather than in createConfigurations,
which is too late.
--
MOS_MIGRATED_REVID=119931633
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildtool')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java index 78e4e747f3..98add31fb7 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java @@ -178,7 +178,7 @@ public final class BuildTool { } configurations = env.getSkyframeExecutor().createConfigurations( env.getReporter(), runtime.getConfigurationFactory(), buildOptions, - env.getDirectories(), request.getMultiCpus(), request.getViewOptions().keepGoing); + request.getMultiCpus(), request.getViewOptions().keepGoing); env.getEventBus().post(new ConfigurationsCreatedEvent(configurations)); env.throwPendingException(); |