2 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
index 251c64a965..85516bc220 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -54,6 +54,7 @@ import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingM
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
+import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileTypeSet;
 import com.google.devtools.build.lib.util.Pair;
@@ -170,6 +171,16 @@ public final class CcCompilationHelper {
       return outputGroups;
     }
 
+    @SkylarkCallable(name = "cc_output_groups", documented = false)
+    public Map<String, SkylarkNestedSet> getSkylarkOutputGroups() {
+      Map<String, SkylarkNestedSet> skylarkOutputGroups = new TreeMap<>();
+      for (Map.Entry<String, NestedSet<Artifact>> entry : outputGroups.entrySet()) {
+        skylarkOutputGroups.put(
+            entry.getKey(), SkylarkNestedSet.of(Artifact.class, entry.getValue()));
+      }
+      return skylarkOutputGroups;
+    }
+
     @SkylarkCallable(name = "cc_compilation_outputs", documented = false)
     public CcCompilationOutputs getCcCompilationOutputs() {
       return compilationOutputs;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
index e9af0c6162..9d53261261 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
@@ -167,7 +167,7 @@ public class CcCompilationOutputs {
     return files.build();
   }
 
-
+  /** Builder for CcCompilationOutputs. */
   public static final class Builder {
     private final Set<Artifact> objectFiles = new LinkedHashSet<>();
     private final Set<Artifact> picObjectFiles = new LinkedHashSet<>();