2 files changed, 6 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
index d84045cf28..801606fc4a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -542,8 +542,8 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory {
     return ruleBuilder
         .addProvider(RunfilesProvider.class, RunfilesProvider.simple(runfiles))
         .addProvider(
-            CppDebugPackageProvider.class,
-            new CppDebugPackageProvider(
+            DebugPackageProvider.class,
+            new DebugPackageProvider(
                 ruleContext.getLabel(), strippedFile, executable, explicitDwpFile))
         .setRunfilesSupport(runfilesSupport, executable)
         .addProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/DebugPackageProvider.java
index 31d3f9d81f..f287c5e719 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/DebugPackageProvider.java
@@ -28,19 +28,18 @@ import javax.annotation.Nullable;
  */
 @Immutable
 @AutoCodec
-public final class CppDebugPackageProvider implements TransitiveInfoProvider {
+public final class DebugPackageProvider implements TransitiveInfoProvider {
   private final Label targetLabel;
   private final Artifact strippedArtifact;
   private final Artifact unstrippedArtifact;
   @Nullable private final Artifact dwpArtifact;
 
   @AutoCodec.Instantiator
-  public CppDebugPackageProvider(
+  public DebugPackageProvider(
       Label targetLabel,
-      Artifact strippedArtifact,
+      @Nullable Artifact strippedArtifact,
       Artifact unstrippedArtifact,
       @Nullable Artifact dwpArtifact) {
-    Preconditions.checkNotNull(strippedArtifact);
     Preconditions.checkNotNull(unstrippedArtifact);
     this.targetLabel = targetLabel;
     this.strippedArtifact = strippedArtifact;
@@ -48,9 +47,7 @@ public final class CppDebugPackageProvider implements TransitiveInfoProvider {
     this.dwpArtifact = dwpArtifact;
   }
 
-  /**
-   * Returns the label for the cc_binary target.
-   */
+  /** Returns the label for the *_binary target. */
   public final Label getTargetLabel() {
     return targetLabel;
   }