aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib
diff options
context:
space:
mode:
authorGravatar Michajlo Matijkiw <michajlo@google.com>2015-05-26 16:17:36 +0000
committerGravatar Laurent Le Brun <laurentlb@google.com>2015-05-27 16:43:04 +0000
commit7eef6f369716f0e3b116f6188bf676965585c872 (patch)
tree35bd0ab726889e99ce1411514e985bfbe7ec6d4b /src/main/java/com/google/devtools/build/lib
parent63f2703b10d0f88a1588a43b514ed38e882cd5b8 (diff)
Filter out middleman artifacts in RunfilesSupplierImpl
-- MOS_MIGRATED_REVID=94477507
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java
index ccdc89021d..0546988380 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java
@@ -17,6 +17,7 @@ package com.google.devtools.build.lib.analysis;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.RunfilesSupplier;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -51,9 +52,8 @@ public class RunfilesSupplierImpl implements RunfilesSupplier {
public Iterable<Artifact> getArtifacts() {
ImmutableSet.Builder<Artifact> builder = ImmutableSet.builder();
for (Entry<PathFragment, Runfiles> entry : inputRunfiles.entrySet()) {
- // TODO(bazel-team): We can likely do without middlemen here, but we should filter that at
- // the Runfiles level.
- builder.addAll(entry.getValue().getAllArtifacts());
+ builder.addAll(
+ Iterables.filter(entry.getValue().getAllArtifacts(), Artifact.MIDDLEMAN_FILTER));
}
return builder.build();
}