Do not require a WORKSPACE file to load the external pkg

--
MOS_MIGRATED_REVID=88277570

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
index 9ba197b8d6..775deda07b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
@@ -87,8 +87,10 @@ class PackageLookupFunction implements SkyFunction {
   private PackageLookupValue getPackageLookupValue(Environment env, Path packagePathEntry,
       PathFragment pkgFragment) throws PackageLookupFunctionException {
     PathFragment buildFileFragment;
+    boolean isWorkspace = false;
     if (pkgFragment.getPathString().equals(PackageFunction.EXTERNAL_PACKAGE_NAME)) {
       buildFileFragment = new PathFragment("WORKSPACE");
+      isWorkspace = true;
     } else {
       buildFileFragment = pkgFragment.getChild("BUILD");
     }
@@ -121,7 +123,7 @@ class PackageLookupFunction implements SkyFunction {
     if (fileValue == null) {
       return null;
     }
-    if (fileValue.isFile()) {
+    if (fileValue.isFile() || isWorkspace) {
       return PackageLookupValue.success(buildFileRootedPath.getRoot());
     }
     return PackageLookupValue.noBuildFile();