Remove ArtifactFactory dependency on incorrect exec root

Somewhat trickily, this changes the execRoot field from referring to
[output_base]/execroot/wsname (not really the exec root) to
[output_base]/execroot (actually the execroot).

Progress on #1681.

--
MOS_MIGRATED_REVID=131286181

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BinTools.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BinTools.java
index eb8af1801f..6ff3203be1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BinTools.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BinTools.java
@@ -137,7 +137,7 @@ public final class BinTools {
   public Artifact getEmbeddedArtifact(String embedPath, ArtifactFactory artifactFactory) {
     PathFragment path = getExecPath(embedPath);
     Preconditions.checkNotNull(path, embedPath + " not found in embedded tools");
-    return artifactFactory.getDerivedArtifact(path);
+    return artifactFactory.getDerivedArtifact(path, binDir.getParentDirectory());
   }
 
   public ImmutableList<Artifact> getAllEmbeddedArtifacts(ArtifactFactory artifactFactory) {