diff options
| author |  nharmata <nharmata@google.com> | 2017-07-25 17:39:09 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-26 10:34:53 +0200 |
| commit | de0c535f123acd5344723ca128ead5d4491aed9c (patch) | |
| tree | 327e964f18d2c7b9eab765b94b2f30eafd1ab4c1 /src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java | |
| parent | e24c97e4fd999ebf566fe30f614c569856a999b2 (diff) | |
Generalize some of methods in TargetPattern, PrepareDepsOfPatternValue, and RecursivePackageProvider dealing with the concept of "excluded directories".
RELNOTES: None
PiperOrigin-RevId: 163074794
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java index 2fb74861a2..4ba21224a2 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java @@ -216,6 +216,7 @@ public class RecursivePackageProviderBackedTargetPatternResolver final String originalPattern, String directory, boolean rulesOnly, + ImmutableSet<PathFragment> blacklistedSubdirectories, ImmutableSet<PathFragment> excludedSubdirectories, BatchCallback<Target, E> callback, Class<E> exceptionClass) @@ -226,6 +227,7 @@ public class RecursivePackageProviderBackedTargetPatternResolver originalPattern, directory, rulesOnly, + blacklistedSubdirectories, excludedSubdirectories, new SynchronizedBatchCallback<Target, E>(callback), MoreExecutors.newDirectExecutorService()).get(); @@ -242,6 +244,7 @@ public class RecursivePackageProviderBackedTargetPatternResolver String originalPattern, String directory, boolean rulesOnly, + ImmutableSet<PathFragment> blacklistedSubdirectories, ImmutableSet<PathFragment> excludedSubdirectories, ThreadSafeBatchCallback<Target, E> callback, Class<E> exceptionClass, @@ -251,6 +254,7 @@ public class RecursivePackageProviderBackedTargetPatternResolver originalPattern, directory, rulesOnly, + blacklistedSubdirectories, excludedSubdirectories, callback, executor); @@ -261,6 +265,7 @@ public class RecursivePackageProviderBackedTargetPatternResolver final String originalPattern, String directory, boolean rulesOnly, + ImmutableSet<PathFragment> blacklistedSubdirectories, ImmutableSet<PathFragment> excludedSubdirectories, final ThreadSafeBatchCallback<Target, E> callback, ListeningExecutorService executor) { @@ -273,7 +278,11 @@ public class RecursivePackageProviderBackedTargetPatternResolver pathFragment = TargetPatternResolverUtil.getPathFragment(directory); packagesUnderDirectory = recursivePackageProvider.getPackagesUnderDirectory( - eventHandler, repository, pathFragment, excludedSubdirectories); + eventHandler, + repository, + pathFragment, + blacklistedSubdirectories, + excludedSubdirectories); } catch (TargetParsingException e) { return Futures.immediateFailedFuture(e); } catch (InterruptedException e) { |