commit 1a38fa0ea63e403081d49b9f84bfa418e4aa9d50
author Googler <noreply@google.com> Wed Jun 24 05:46:54 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 24 05:48:20 2020 -0700
tree 3f9a9389a8ff9de0dc5aa63d86680971ac1ac4dc
parent 3d90c3f99968dc8b747b9a999de61b0687c2ce43

Fix an incorrect constant usage in plantSymlinkForExternalRepo.

LabelConstants.EXTERNAL_PACKAGE_NAME is a conceptual path fragment to represent
the //external package and has nothing to do with the parent directories for
external repo symlinks in the execroot. The correct one is
LabelConstants.EXTERNAL_PATH_PREFIX.

PiperOrigin-RevId: 318048497

src/main/java/com/google/devtools/build/lib/buildtool/SymlinkForest.java

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/SymlinkForest.java b/src/main/java/com/google/devtools/build/lib/buildtool/SymlinkForest.java
index fbaa9ac..c869c1f 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/SymlinkForest.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/SymlinkForest.java
@@ -139,7 +139,7 @@
     Path execrootLink = execroot.getRelative(repository.getExecPath(siblingRepositoryLayout));
 
     if (!siblingRepositoryLayout && externalRepoLinks.isEmpty()) {
-      execroot.getRelative(LabelConstants.EXTERNAL_PACKAGE_NAME).createDirectoryAndParents();
+      execroot.getRelative(LabelConstants.EXTERNAL_PATH_PREFIX).createDirectoryAndParents();
     }
     if (!externalRepoLinks.add(execrootLink)) {
       return;