Introduce CompositeRunfilesSupplier

A convenience used to compose RunfilesSuppliers without having to
deconstruct them.

--
MOS_MIGRATED_REVID=95854609

1 files changed, 11 insertions, 0 deletions

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 c915cae16f..216a782e92 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
@@ -16,6 +16,8 @@ package com.google.devtools.build.lib.analysis;
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.EmptyRunfilesSupplier;
+import com.google.devtools.build.lib.actions.RunfilesSupplier;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.syntax.Label;
 
@@ -84,4 +86,13 @@ public final class FilesToRunProvider implements TransitiveInfoProvider {
   @Nullable public Artifact getRunfilesManifest() {
     return runfilesSupport != null ? runfilesSupport.getRunfilesManifest() : null;
   }
+
+  /** Return a {@link RunfilesSupplier} encapsulating runfiles for this tool. */
+  public RunfilesSupplier getRunfilesSupplier() {
+    if (executable != null && runfilesSupport != null) {
+      return new RunfilesSupplierImpl(executable, runfilesSupport.getRunfiles());
+    } else {
+      return EmptyRunfilesSupplier.INSTANCE;
+    }
+  }
 }