diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java index 97aef9845f..d805a91695 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java @@ -14,6 +14,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.cmdline.ResolvedTargets; import com.google.devtools.build.lib.cmdline.TargetParsingException; import com.google.devtools.build.lib.cmdline.TargetPattern; @@ -47,16 +48,16 @@ public class TargetPatternFunction implements SkyFunction { InterruptedException { TargetPatternValue.TargetPatternKey patternKey = ((TargetPatternValue.TargetPatternKey) key.argument()); - TargetPattern.Parser parser = new TargetPattern.Parser(patternKey.getOffset()); - ResolvedTargets<Target> resolvedTargets = null; + ResolvedTargets<Target> resolvedTargets; try { EnvironmentBackedRecursivePackageProvider provider = new EnvironmentBackedRecursivePackageProvider(env); RecursivePackageProviderBackedTargetPatternResolver resolver = new RecursivePackageProviderBackedTargetPatternResolver(provider, env.getListener(), patternKey.getPolicy(), pkgPath.get()); - TargetPattern resolvedPattern = parser.parse(patternKey.getPattern()); - resolvedTargets = resolvedPattern.eval(resolver); + TargetPattern parsedPattern = patternKey.getParsedPattern(); + ImmutableSet<String> excludedSubdirectories = patternKey.getExcludedSubdirectories(); + resolvedTargets = parsedPattern.eval(resolver, excludedSubdirectories); } catch (TargetParsingException e) { throw new TargetPatternFunctionException(e); } catch (MissingDepException e) { |