commit fdfdd92b44bf0bfeb3a1e98b9ce9321941a39baa
author Ulf Adams <ulfjack@google.com> Tue Sep 01 08:36:29 2015 +0000
committer Lukacs Berki <lberki@google.com> Tue Sep 01 10:43:46 2015 +0000
tree f06157ef9343e865deb023b662dfafc69769cd40
parent 5c54bdcc5b6d686687120b19be710d08e5186da8

Inject the prelude path through the rule class provider.

--
MOS_MIGRATED_REVID=102020499

src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index 38b4ac4..c8fad50 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
@@ -21,7 +21,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.google.devtools.build.lib.Constants;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier.RepositoryName;
 import com.google.devtools.build.lib.events.Event;
@@ -89,22 +88,21 @@
   private final AtomicInteger numPackagesLoaded;
   private final Profiler profiler = Profiler.instance();
 
-  static final PathFragment PRELUDE_FILE_FRAGMENT =
-      new PathFragment(Constants.PRELUDE_FILE_DEPOT_RELATIVE_PATH);
+  private final PathFragment preludePath;
 
   static final String DEFAULTS_PACKAGE_NAME = "tools/defaults";
   public static final String EXTERNAL_PACKAGE_NAME = "external";
 
-  static {
-    Preconditions.checkArgument(!PRELUDE_FILE_FRAGMENT.isAbsolute());
-  }
-
   public PackageFunction(Reporter reporter, PackageFactory packageFactory,
       CachingPackageLocator pkgLocator, AtomicBoolean showLoadingProgress,
       Cache<PackageIdentifier, Package.LegacyBuilder> packageFunctionCache,
       AtomicInteger numPackagesLoaded) {
     this.reporter = reporter;
 
+    // Can be null in tests.
+    this.preludePath = packageFactory == null
+        ? null
+        : packageFactory.getRuleClassProvider().getPreludePath();
     this.packageFactory = packageFactory;
     this.packageLocator = pkgLocator;
     this.showLoadingProgress = showLoadingProgress;
@@ -423,7 +421,7 @@
     SkyKey astLookupKey = null;
     try {
       astLookupKey = ASTFileLookupValue.key(
-          PackageIdentifier.createInDefaultRepo(PRELUDE_FILE_FRAGMENT));
+          PackageIdentifier.createInDefaultRepo(preludePath));
     } catch (ASTLookupInputException e) {
       // There's a static check ensuring that PRELUDE_FILE_FRAGMENT is relative.
       throw new IllegalStateException(e);
@@ -597,7 +595,7 @@
         // a load() statement comes from the prelude, since we just prepend those statements before
         // the actual BUILD file. So we use this evil .endsWith() statement to figure it out.
         RepositoryName repository =
-            entry.getKey().getPath().endsWith(PRELUDE_FILE_FRAGMENT)
+            entry.getKey().getPath().endsWith(preludePath)
                 ? PackageIdentifier.DEFAULT_REPOSITORY_NAME : packageId.getRepository();
         SkyKey importsLookupKey = SkylarkImportLookupValue.key(
             repository, buildFileFragment, importFile);