diff options
| author |  janakr <janakr@google.com> | 2017-09-14 09:55:40 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-14 18:47:27 +0200 |
| commit | 3b63a4e67c547a656000dfd4e9d61f68a21b92d8 (patch) | |
| tree | fa84bb33fd9741aa5a59de627909e0f5dd984e5f /src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java | |
| parent | aa437e01b1879f0e1ba0452ce6137d80586258da (diff) | |
Remove deepExecRoot from BlazeDirectories. It is now the default. Also inline constructor that did ServerDirectories creation inline: don't pollute production code for tests' convenience.
PiperOrigin-RevId: 168652349
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java index a958214df0..5824c4d118 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.Reporter; @@ -192,8 +193,8 @@ public abstract class AbstractPackageLoader implements PackageLoader { // WorkspaceFileFunction, so we pass in a dummy Path. // TODO(nharmata): Refactor WorkspaceFileFunction to make this a non-issue. Path devNull = workspaceDir.getFileSystem().getPath("/dev/null"); - this.directories = new BlazeDirectories(/*installBase=*/devNull, - /*outputBase=*/devNull, /*workspace=*/workspaceDir, "blaze"); + this.directories = + new BlazeDirectories(new ServerDirectories(devNull, devNull), workspaceDir, "blaze"); this.externalFilesHelper = new ExternalFilesHelper( pkgLocatorRef, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, |