Fix getBuildFiles to not assume BUILD is the name of the build file.

Fixes #4056.

Change-Id: Ia7425c2146f15e9293605ee3da53007805e82275
PiperOrigin-RevId: 177813070

1 files changed, 12 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
index 81c7c7afe2..285c45fa1c 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
@@ -52,9 +52,11 @@ import java.util.Map;
 public final class EnvironmentBackedRecursivePackageProvider implements RecursivePackageProvider {
 
   private final Environment env;
+  private final PathPackageLocator pkgPath;
 
-  public EnvironmentBackedRecursivePackageProvider(Environment env) {
+  public EnvironmentBackedRecursivePackageProvider(Environment env, PathPackageLocator pkgPath) {
     this.env = env;
+    this.pkgPath = pkgPath;
   }
 
   @Override
@@ -94,6 +96,15 @@ public final class EnvironmentBackedRecursivePackageProvider implements Recursiv
   }
 
   @Override
+  public Path getBuildFileForPackage(PackageIdentifier packageName) {
+    try {
+      return pkgPath.getPackageBuildFile(packageName);
+    } catch (NoSuchPackageException e) {
+      return null;
+    }
+  }
+
+  @Override
   public boolean isPackage(ExtendedEventHandler eventHandler, PackageIdentifier packageId)
       throws MissingDepException, InterruptedException {
     SkyKey packageLookupKey = PackageLookupValue.key(packageId);