Don't copy files under embedded_tools to _bin

Fixed https://github.com/bazelbuild/bazel/issues/1743

--
MOS_MIGRATED_REVID=132849841

1 files changed, 9 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 6ff3203be1..73cc667034 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
@@ -43,7 +43,15 @@ public final class BinTools {
   private BinTools(BlazeDirectories directories, ImmutableList<String> tools) {
     this.directories = directories;
     this.binDir = directories.getExecRoot().getRelative("_bin");
-    this.embeddedTools = tools;
+    ImmutableList.Builder<String> builder = ImmutableList.builder();
+    // Files under embedded_tools shouldn't be copied to under _bin dir
+    // They won't be used during action execution time.
+    for (String tool : tools) {
+      if (!tool.startsWith("embedded_tools/")) {
+        builder.add(tool);
+      }
+    }
+    this.embeddedTools = builder.build();
   }
 
   /**