aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/analysis
diff options
context:
space:
mode:
authorGravatar Alex Humesky <ahumesky@google.com>2016-03-18 02:43:32 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2016-03-18 12:48:34 +0000
commit653b1ab828115a648c89ef9ed062f904c3a9d12d (patch)
treecfaa948c3705c5f37ae079a1d21955458f6aa62b /src/main/java/com/google/devtools/build/lib/analysis
parenta29cf78cfc35e943c1e13a98ad009f1bdae486eb (diff)
Allow PackageRootResolver to take in directories for findPackageRoots().
-- MOS_MIGRATED_REVID=117512506
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/SkyframePackageRootResolver.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SkyframePackageRootResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/SkyframePackageRootResolver.java
index 8fed1a7993..2b4a61e6b7 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/SkyframePackageRootResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/SkyframePackageRootResolver.java
@@ -23,6 +23,8 @@ import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.Map;
+import javax.annotation.Nullable;
+
/**
* Skyframe implementation of {@link PackageRootResolver}.
*
@@ -40,6 +42,13 @@ public final class SkyframePackageRootResolver implements PackageRootResolver {
@Override
public Map<PathFragment, Root> findPackageRootsForFiles(Iterable<PathFragment> execPaths)
throws PackageRootResolutionException {
+ return executor.getArtifactRootsForFiles(eventHandler, execPaths);
+ }
+
+ @Override
+ @Nullable
+ public Map<PathFragment, Root> findPackageRoots(Iterable<PathFragment> execPaths)
+ throws PackageRootResolutionException {
return executor.getArtifactRoots(eventHandler, execPaths);
}
}