Now that external files are not always treated as immutable, eliminate the "overlaid BUILD files" hack in RepositoryValue.

--
MOS_MIGRATED_REVID=109877252

1 files changed, 2 insertions, 6 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 28557d1b9c..36350f5c31 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
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.cmdline.LabelValidator;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
@@ -178,14 +177,11 @@ public class PackageLookupFunction implements SkyFunction {
     if (fileValue == null) {
       return null;
     }
-    Optional<FileValue> overlaidBuildFile = repositoryValue.getOverlaidBuildFile();
+
     if (fileValue.isFile()) {
-      if (overlaidBuildFile.isPresent()) {
-        return PackageLookupValue.overlaidBuildFile(repositoryValue.getPath(), overlaidBuildFile);
-      } else {
         return PackageLookupValue.success(repositoryValue.getPath());
-      }
     }
+
     return PackageLookupValue.NO_BUILD_FILE_VALUE;
   }