Disambiguate jar paths in the exec root tree

Before, external jars would stomp on each other and the last jar loaded would
"win" (all others would be overwritten and the build would fail). This changes
symlink forest path generation to generate unique paths under
<exec-root>/external/ for jars, so multiple external jar dependencies can be
used.

--
MOS_MIGRATED_REVID=88952191

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/ExternalPackage.java b/src/main/java/com/google/devtools/build/lib/packages/ExternalPackage.java
index aa089e53d6..913959e602 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/ExternalPackage.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/ExternalPackage.java
@@ -40,7 +40,7 @@ public class ExternalPackage extends Package {
   private Map<RepositoryName, Rule> repositoryMap;
 
   ExternalPackage() {
-    super(PackageIdentifier.createInDefaultRepo("external"));
+    super(PackageIdentifier.createInDefaultRepo(NAME));
   }
 
   /**
@@ -93,7 +93,7 @@ public class ExternalPackage extends Package {
      * Checks if the label is bound, i.e., starts with {@code //external:}.
      */
     public static boolean isBoundLabel(Label label) {
-      return label.getPackageName().equals("external");
+      return label.getPackageName().equals(NAME);
     }
   }