Automatic code cleanup.

PiperOrigin-RevId: 422818334
bazelbuild · Jan 19, 2022 · 788ff3e · 788ff3e
1 parent 123da96
commit 788ff3e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -489,7 +489,8 @@ public static void init(
                 .setCcNativeLibraryInfo(ccNativeLibraryInfo)
                 .build())
         .addOutputGroups(
-            CcCommon.mergeOutputGroups(ImmutableList.of(currentOutputGroups, outputGroups.build())))
+            CcCommon.mergeOutputGroups(
+                ImmutableList.of(currentOutputGroups, outputGroups.buildOrThrow())))
         .addNativeDeclaredProvider(instrumentedFilesProvider)
         .addProvider(RunfilesProvider.withData(defaultRunfiles.build(), dataRunfiles.build()));
   }
@@ -590,7 +591,7 @@ private static Map<String, NestedSet<Artifact>> addLinkerOutputArtifacts(
         ImmutableSortedMap.naturalOrder();
     if (!ruleContext.attributes().has("alwayslink", Type.BOOLEAN)
         || !ruleContext.attributes().has("linkstatic", Type.BOOLEAN)) {
-      return outputGroups.build();
+      return outputGroups.buildOrThrow();
     }
 
     if (ruleContext.attributes().get("alwayslink", Type.BOOLEAN)) {
@@ -635,7 +636,7 @@ private static Map<String, NestedSet<Artifact>> addLinkerOutputArtifacts(
 
     outputGroups.put(ARCHIVE_LIBRARY_OUTPUT_GROUP_NAME, archiveFile.build());
     outputGroups.put(DYNAMIC_LIBRARY_OUTPUT_GROUP_NAME, dynamicLibrary.build());
-    return outputGroups.build();
+    return outputGroups.buildOrThrow();
   }
 
   private static ImmutableList<LibraryToLink> createLibrariesToLinkList(