From ee6a6862e26704854fb08bd90912890814cc3426 Mon Sep 17 00:00:00 2001
From: tomlu <tomlu@google.com>
Date: Wed, 17 Jan 2018 14:36:26 -0800
Subject: Introduce Root class.

This class represents a root (such as a package path or an output root) used for file lookups and artifacts. It is meant to be as opaque as possible in order to hide the user's environment from sky keys and sky functions.

Roots are used by RootedPaths and ArtifactRoots.

This CL attempts to make the minimum number of modifications necessary to change RootedPath and ArtifactRoot to use these fields. Deprecated methods and invasive accessors are permitted to minimise the risk of any observable changes.

RELNOTES: None
PiperOrigin-RevId: 182271759
---
 .../google/devtools/build/lib/skyframe/ProcessPackageDirectory.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java')

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java b/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java
index e46f4f2b74..d4fba1a2e3 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java
@@ -25,8 +25,8 @@ import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.vfs.Dirent;
 import com.google.devtools.build.lib.vfs.Dirent.Type;
-import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
+import com.google.devtools.build.lib.vfs.Root;
 import com.google.devtools.build.lib.vfs.RootedPath;
 import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyKey;
@@ -167,7 +167,7 @@ public class ProcessPackageDirectory {
       RootedPath rootedPath,
       RepositoryName repositoryName,
       Set<PathFragment> excludedPaths) {
-    Path root = rootedPath.getRoot();
+    Root root = rootedPath.getRoot();
     PathFragment rootRelativePath = rootedPath.getRelativePath();
     boolean followSymlinks = shouldFollowSymlinksWhenTraversing(dirListingValue.getDirents());
     List<SkyKey> childDeps = new ArrayList<>();
-- 
cgit v1.2.3