Add a convenience method to InstrumentedFilesCollector.

This simplifies the users a bit, and makes it easier to refactor the code.

--
MOS_MIGRATED_REVID=101802767

1 files changed, 3 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/filegroup/Filegroup.java b/src/main/java/com/google/devtools/build/lib/rules/filegroup/Filegroup.java
index 83d3d7a20f..a95ff65e7a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/filegroup/Filegroup.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/filegroup/Filegroup.java
@@ -32,7 +32,6 @@ import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.rules.test.InstrumentedFilesCollector;
 import com.google.devtools.build.lib.rules.test.InstrumentedFilesCollector.InstrumentationSpec;
 import com.google.devtools.build.lib.rules.test.InstrumentedFilesProvider;
-import com.google.devtools.build.lib.rules.test.InstrumentedFilesProviderImpl;
 import com.google.devtools.build.lib.util.FileTypeSet;
 import com.google.devtools.build.lib.vfs.PathFragment;
 
@@ -50,8 +49,8 @@ public class Filegroup implements RuleConfiguredTargetFactory {
     NestedSet<Artifact> middleman = CompilationHelper.getAggregatingMiddleman(
         ruleContext, Actions.escapeLabel(ruleContext.getLabel()), filesToBuild);
 
-    InstrumentedFilesCollector instrumentedFilesCollector =
-        new InstrumentedFilesCollector(ruleContext,
+    InstrumentedFilesProvider instrumentedFilesProvider =
+        InstrumentedFilesCollector.collect(ruleContext,
             // what do *we* know about whether this is a source file or not
             new InstrumentationSpec(FileTypeSet.ANY_FILE, "srcs", "deps", "data"),
             InstrumentedFilesCollector.NO_METADATA_COLLECTOR, filesToBuild);
@@ -68,8 +67,7 @@ public class Filegroup implements RuleConfiguredTargetFactory {
         .add(RunfilesProvider.class, runfilesProvider)
         .setFilesToBuild(filesToBuild)
         .setRunfilesSupport(null, getExecutable(filesToBuild))
-        .add(InstrumentedFilesProvider.class, new InstrumentedFilesProviderImpl(
-            instrumentedFilesCollector))
+        .add(InstrumentedFilesProvider.class, instrumentedFilesProvider)
         .add(MiddlemanProvider.class, new MiddlemanProvider(middleman))
         .add(FilegroupPathProvider.class,
             new FilegroupPathProvider(getFilegroupPath(ruleContext)))