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