Actually add OutputGroupProvider.DEFAULT to the set of files to be built when the default is specified (and not just filesToBuild).

This is necessary so that rules that explicitly add artifacts to OutputGrovider.DEFAULT have those artifacts built when they are mentioned on the command line.

--
MOS_MIGRATED_REVID=89387243

1 files changed, 9 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
index 54edf029a0..39c04a403e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
@@ -113,22 +113,25 @@ public final class TopLevelArtifactHelper {
         target.getProvider(OutputGroupProvider.class);
 
     for (String outputGroup : context.outputGroups()) {
-      NestedSet<Artifact> results = null;
+      NestedSetBuilder<Artifact> results = NestedSetBuilder.stableOrder();
 
       if (outputGroup.equals(OutputGroupProvider.DEFAULT)) {
+        // For the default group, we also throw in filesToBuild
         FileProvider fileProvider = target.getProvider(FileProvider.class);
         if (fileProvider != null) {
-          results = fileProvider.getFilesToBuild();
+          results.addTransitive(fileProvider.getFilesToBuild());
         }
-      } else if (outputGroupProvider != null) {
-        results = outputGroupProvider.getOutputGroup(outputGroup);
+      }
+
+      if (outputGroupProvider != null) {
+        results.addTransitive(outputGroupProvider.getOutputGroup(outputGroup));
       }
 
       if (results != null) {
         if (outputGroup.startsWith(OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX)) {
-          allBuilder.addTransitive(results);
+          allBuilder.addTransitive(results.build());
         } else {
-          importantBuilder.addTransitive(results);
+          importantBuilder.addTransitive(results.build());
         }
       }
     }