diff options
author | Lukacs Berki <lberki@google.com> | 2015-10-14 15:12:23 +0000 |
---|---|---|
committer | David Chen <dzc@google.com> | 2015-10-14 18:29:55 +0000 |
commit | 8096c4274ac57267dace4166ac05d5665b098d95 (patch) | |
tree | 5d088a21df36e074050701492780cb8be462e660 /src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java | |
parent | 46438367d7400d6c27bda0dd1ea1c30f51957eea (diff) |
Pass PackageIdentifier through a bit more code in target parsing in preparation for eventually implementing recursive target patterns for remote repositories.
--
MOS_MIGRATED_REVID=105412566
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java index 5dc6fc3e0b..fffcd38c36 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java @@ -110,7 +110,9 @@ public final class GraphBackedRecursivePackageProvider implements RecursivePacka for (TargetPatternKey patternKey : universeTargetPatternKeys) { TargetPattern pattern = patternKey.getParsedPattern(); boolean isTBD = pattern.getType().equals(Type.TARGETS_BELOW_DIRECTORY); - if (isTBD && pattern.containsBelowDirectory(directory.getRelativePath().getPathString())) { + PackageIdentifier packageIdentifier = PackageIdentifier.create( + repository, directory.getRelativePath()); + if (isTBD && pattern.containsBelowDirectory(packageIdentifier)) { filteringPolicy = pattern.getRulesOnly() ? FilteringPolicies.RULES_ONLY : FilteringPolicies.NO_FILTER; break; |