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

2 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
index 0badadd258..7d5e05f045 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
@@ -224,7 +224,7 @@ public abstract class InfoItem {
     public byte[] get(Supplier<BuildConfiguration> configurationSupplier, CommandEnvironment env)
         throws AbruptExitException {
       checkNotNull(configurationSupplier);
-      return print(configurationSupplier.get().getBinDirectory(RepositoryName.MAIN).getPath());
+      return print(configurationSupplier.get().getBinDirectory(RepositoryName.MAIN).getRoot());
     }
   }
 
@@ -245,8 +245,7 @@ public abstract class InfoItem {
     public byte[] get(Supplier<BuildConfiguration> configurationSupplier, CommandEnvironment env)
         throws AbruptExitException {
       checkNotNull(configurationSupplier);
-      return print(
-          configurationSupplier.get().getGenfilesDirectory(RepositoryName.MAIN).getPath());
+      return print(configurationSupplier.get().getGenfilesDirectory(RepositoryName.MAIN).getRoot());
     }
   }
 
@@ -267,8 +266,7 @@ public abstract class InfoItem {
     public byte[] get(Supplier<BuildConfiguration> configurationSupplier, CommandEnvironment env)
         throws AbruptExitException {
       checkNotNull(configurationSupplier);
-      return print(
-          configurationSupplier.get().getTestLogsDirectory(RepositoryName.MAIN).getPath());
+      return print(configurationSupplier.get().getTestLogsDirectory(RepositoryName.MAIN).getRoot());
     }
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
index ffb81648f6..a14ff5a23c 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
@@ -23,6 +23,7 @@ import com.google.devtools.build.lib.runtime.ProjectFile;
 import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
 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.common.options.OptionPriority.PriorityCategory;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.OptionsParsingException;
@@ -60,7 +61,7 @@ public final class ProjectFileSupport {
       // cwd is a subdirectory of the workspace, that will be surprising, and we should interpret it
       // relative to the cwd instead.
       PathFragment projectFilePath = PathFragment.create(targets.get(0).substring(1));
-      List<Path> packagePath =
+      List<Root> packagePath =
           PathPackageLocator.create(
                   // We only need a non-null outputBase for the PathPackageLocator if we support
                   // external