2 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FileConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/FileConfiguredTarget.java
index 815eea7763..023144471e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/FileConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/FileConfiguredTarget.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.analysis;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.UnmodifiableIterator;
@@ -47,8 +46,8 @@ public abstract class FileConfiguredTarget extends AbstractConfiguredTarget
         .put(VisibilityProvider.class, this)
         .put(LicensesProvider.class, this)
         .put(FileProvider.class, new FileProvider(targetContext.getLabel(), filesToBuild))
-        .put(FilesToRunProvider.class, new FilesToRunProvider(targetContext.getLabel(),
-            ImmutableList.copyOf(filesToBuild), null, artifact));
+        .put(FilesToRunProvider.class, FilesToRunProvider.fromSingleArtifact(
+            targetContext.getLabel(), artifact));
     if (this instanceof FilesetProvider) {
       builder.put(FilesetProvider.class, this);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
index 0e024b1e75..c915cae16f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
@@ -41,6 +41,13 @@ public final class FilesToRunProvider implements TransitiveInfoProvider {
   }
 
   /**
+   * Creates an instance that contains one single executable and no other files.
+   */
+  public static FilesToRunProvider fromSingleArtifact(Label label, Artifact artifact) {
+    return new FilesToRunProvider(label, ImmutableList.of(artifact), null, artifact);
+  }
+
+  /**
    * Returns the label that is associated with this piece of information.
    *
    * <p>This is usually the label of the target that provides the information.