commit d13207c8da178025d56df37a497092b3de971b3a
author Ulf Adams <ulfjack@google.com> Fri Sep 04 14:53:43 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Sep 04 16:32:23 2015 +0000
tree b9fec6f6a64f2d015853b0fc864cae7f0bcebce2
parent 29a173a05df7926e5530175b2e6835f2e9b19d0b

Inject the default runfiles prefix from the rule class provider.

--
MOS_MIGRATED_REVID=102341264

src/main/java/com/google/devtools/build/lib/packages/Package.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index 92a24fb..2a6945c 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 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.collect.CollectionUtils;
 import com.google.devtools.build.lib.collect.ImmutableSortedKeyMap;
@@ -107,7 +106,7 @@
    * The name of the workspace this package is in. Used as a prefix for the runfiles directory.
    * This can be set in the WORKSPACE file. This must be a valid target name.
    */
-  protected String workspaceName = Constants.DEFAULT_RUNFILES_PREFIX;
+  protected String workspaceName;
 
   /**
    * The root of the source tree in which this package was found. It is an invariant that
@@ -226,8 +225,9 @@
    * @precondition {@code name} must be a suffix of
    * {@code filename.getParentDirectory())}.
    */
-  protected Package(PackageIdentifier packageId) {
+  protected Package(PackageIdentifier packageId, String runfilesPrefix) {
     this.packageIdentifier = packageId;
+    this.workspaceName = runfilesPrefix;
     this.nameFragment = Canonicalizer.fragments().intern(packageId.getPackageFragment());
     this.name = nameFragment.getPathString();
   }
@@ -723,11 +723,10 @@
    * <p>Despite its name, this is the normal builder used when parsing BUILD files.
    */
   public static class LegacyBuilder extends Builder {
-
     private Globber globber = null;
 
-    LegacyBuilder(PackageIdentifier packageId) {
-      super(packageId);
+    LegacyBuilder(PackageIdentifier packageId, String runfilesPrefix) {
+      super(packageId, runfilesPrefix);
     }
 
     /**
@@ -761,8 +760,8 @@
   }
 
   static class Builder {
-    protected static Package newPackage(PackageIdentifier packageId) {
-      return new Package(packageId);
+    protected static Package newPackage(PackageIdentifier packageId, String runfilesPrefix) {
+      return new Package(packageId, runfilesPrefix);
     }
 
     /**
@@ -826,8 +825,8 @@
       }
     }
 
-    Builder(PackageIdentifier id) {
-      this(newPackage(id));
+    Builder(PackageIdentifier id, String runfilesPrefix) {
+      this(newPackage(id, runfilesPrefix));
     }
 
     protected PackageIdentifier getPackageIdentifier() {