diff options
| author |  John Cater <jcater@google.com> | 2017-12-04 07:53:19 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-04 07:55:32 -0800 |
| commit | e5fb5f07ba9fe0dc40fc2d6039973dab5794f876 (patch) | |
| tree | 96835f310868674e5ea02d41690233c5502f819d /src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java | |
| parent | 8e9b2895763eb9c38b0307fdff3268c0eee221a2 (diff) | |
Fix getBuildFiles to not assume BUILD is the name of the build file.
Fixes #4056.
Change-Id: Ia7425c2146f15e9293605ee3da53007805e82275
PiperOrigin-RevId: 177813070
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, 7 insertions, 2 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 b97e51a509..b4a012fcdc 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 @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.collect.compacthashset.CompactHashSet; import com.google.devtools.build.lib.concurrent.MultisetSemaphore; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.ParsingFailedEvent; +import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.EnvironmentBackedRecursivePackageProvider.MissingDepException; import com.google.devtools.build.lib.util.BatchCallback; import com.google.devtools.build.lib.vfs.PathFragment; @@ -33,6 +34,7 @@ import com.google.devtools.build.skyframe.SkyFunctionException; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; /** @@ -41,7 +43,10 @@ import javax.annotation.Nullable; */ public class TargetPatternFunction implements SkyFunction { - public TargetPatternFunction() { + private final AtomicReference<PathPackageLocator> pkgPath; + + public TargetPatternFunction(AtomicReference<PathPackageLocator> pkgPath) { + this.pkgPath = pkgPath; } @Override @@ -52,7 +57,7 @@ public class TargetPatternFunction implements SkyFunction { ResolvedTargets<Target> resolvedTargets; try { EnvironmentBackedRecursivePackageProvider provider = - new EnvironmentBackedRecursivePackageProvider(env); + new EnvironmentBackedRecursivePackageProvider(env, pkgPath.get()); RecursivePackageProviderBackedTargetPatternResolver resolver = new RecursivePackageProviderBackedTargetPatternResolver( provider, |