commit 4226be2ddaf265c1eba70f28e0ed1d9578cf6690
author Ulf Adams <ulfjack@google.com> Thu Sep 03 17:00:54 2015 +0000
committer David Chen <dzc@google.com> Thu Sep 03 22:17:02 2015 +0000
tree e76ae52098d11cff0741ec96a1fdbd1729962fa7
parent c49ebe1d6433fee4a91f026462767f6d685e6346

Always inject the runfiles prefix into the Runfiles.Builder.

The other constructor is now private.

--
MOS_MIGRATED_REVID=102252544

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 c6156ac..28681d4 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
@@ -761,6 +761,10 @@
   }
 
   static class Builder {
+    protected static Package newPackage(PackageIdentifier packageId) {
+      return new Package(packageId);
+    }
+
     /**
      * The output instance for this builder. Needs to be instantiated and
      * available with name info throughout initialization. All other settings
@@ -822,10 +826,9 @@
       }
     }
 
-    protected static Package newPackage(PackageIdentifier packageId) {
-      return new Package(packageId);
+    Builder(PackageIdentifier id) {
+      this(newPackage(id));
     }
-    Builder(PackageIdentifier id) { this(newPackage(id)); }
 
     protected PackageIdentifier getPackageIdentifier() {
       return pkg.getPackageIdentifier();