Remove CachingPackageLocator interface from the PackageProvider hierarchy

This simplifies the code quite a bit.

PiperOrigin-RevId: 199427943

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
index e8a59d958f..510fc42bfe 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
@@ -140,12 +140,12 @@ public class PrepareDepsOfPatternFunction implements SkyFunction {
 
     private final EnvironmentBackedRecursivePackageProvider packageProvider;
     private final Environment env;
-    private final PathPackageLocator pkgPath;
+    private final ImmutableList<Root> pkgRoots;
 
     public DepsOfPatternPreparer(Environment env, PathPackageLocator pkgPath) {
       this.env = env;
-      this.packageProvider = new EnvironmentBackedRecursivePackageProvider(env, pkgPath);
-      this.pkgPath = pkgPath;
+      this.packageProvider = new EnvironmentBackedRecursivePackageProvider(env);
+      this.pkgRoots = pkgPath.getPathEntries();
     }
 
     @Override
@@ -248,7 +248,7 @@ public class PrepareDepsOfPatternFunction implements SkyFunction {
           rulesOnly ? FilteringPolicies.RULES_ONLY : FilteringPolicies.NO_FILTER;
       List<Root> roots = new ArrayList<>();
       if (repository.isMain()) {
-        roots.addAll(pkgPath.getPathEntries());
+        roots.addAll(pkgRoots);
       } else {
         RepositoryDirectoryValue repositoryValue =
             (RepositoryDirectoryValue) env.getValue(RepositoryDirectoryValue.key(repository));