Remove support for the deprecated include() statement in order to be able to separate Skylark from the rest of the code so that Label parsing can be simplified.

This is another go at []: now that the tests were fixed in [] and [] it can be submitted again.

--
MOS_MIGRATED_REVID=103364881

1 files changed, 2 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
index 9bc6bf226c..a7cd395b33 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
-import com.google.devtools.build.lib.packages.CachingPackageLocator;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
 import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
 import com.google.devtools.build.lib.syntax.BuildFileAST;
@@ -112,13 +111,10 @@ public class ASTFileLookupFunction implements SkyFunction {
 
   private final AtomicReference<PathPackageLocator> pkgLocator;
   private final RuleClassProvider ruleClassProvider;
-  private final CachingPackageLocator packageManager;
 
   public ASTFileLookupFunction(AtomicReference<PathPackageLocator> pkgLocator,
-      CachingPackageLocator packageManager,
       RuleClassProvider ruleClassProvider) {
     this.pkgLocator = pkgLocator;
-    this.packageManager = packageManager;
     this.ruleClassProvider = ruleClassProvider;
   }
 
@@ -143,7 +139,7 @@ public class ASTFileLookupFunction implements SkyFunction {
       if (parseAsSkylark) {
         try (Mutability mutability = Mutability.create("validate")) {
             ast = BuildFileAST.parseSkylarkFile(path, fileSize, env.getListener(),
-                packageManager, new ValidationEnvironment(
+                new ValidationEnvironment(
                     ruleClassProvider.createSkylarkRuleClassEnvironment(
                         mutability,
                         env.getListener(),
@@ -153,7 +149,7 @@ public class ASTFileLookupFunction implements SkyFunction {
                     .setupDynamic(Runtime.PKG_NAME, Runtime.NONE)));
         }
       } else {
-        ast = BuildFileAST.parseBuildFile(path, fileSize, env.getListener(), packageManager, false);
+        ast = BuildFileAST.parseBuildFile(path, fileSize, env.getListener(), false);
       }
     } catch (IOException e) {
         throw new ASTLookupFunctionException(new ErrorReadingSkylarkExtensionException(