Rename Root to ArtifactRoot.

This is slightly more descriptive, and we will potentially want to use the name Root for a broader concept shared between ArtifactRoot and RootedPath.

PiperOrigin-RevId: 182082367

1 files changed, 11 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
index c80875d7d8..b8cbd4a6f7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
@@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.actions.ActionKeyContext;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ArtifactFactory;
-import com.google.devtools.build.lib.actions.Root;
+import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildInfoContext;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildInfoKey;
@@ -70,15 +70,16 @@ public class BuildInfoCollectionFunction implements SkyFunction {
         nameValue.getName());
 
     final ArtifactFactory factory = artifactFactory.get();
-    BuildInfoContext context = new BuildInfoContext() {
-      @Override
-      public Artifact getBuildInfoArtifact(PathFragment rootRelativePath, Root root,
-          BuildInfoType type) {
-        return type == BuildInfoType.NO_REBUILD
-            ? factory.getConstantMetadataArtifact(rootRelativePath, root, keyAndConfig)
-            : factory.getDerivedArtifact(rootRelativePath, root, keyAndConfig);
-      }
-    };
+    BuildInfoContext context =
+        new BuildInfoContext() {
+          @Override
+          public Artifact getBuildInfoArtifact(
+              PathFragment rootRelativePath, ArtifactRoot root, BuildInfoType type) {
+            return type == BuildInfoType.NO_REBUILD
+                ? factory.getConstantMetadataArtifact(rootRelativePath, root, keyAndConfig)
+                : factory.getDerivedArtifact(rootRelativePath, root, keyAndConfig);
+          }
+        };
 
     return new BuildInfoCollectionValue(
         actionKeyContext,