From 13ba35885656455c7ad83704cf55fdace94c7cf2 Mon Sep 17 00:00:00 2001 From: hlopko Date: Mon, 30 Apr 2018 05:42:48 -0700 Subject: Automated rollback of commit dade44dab4a571acc710f0960a3afda0d7b183b3. *** Reason for rollback *** Breaks 70k targets in nightly *** Original change description *** CppDebugPackageProvider is useful for more than just C++, so rename it. RELNOTES: None. PiperOrigin-RevId: 194773896 --- .../devtools/build/lib/rules/cpp/CcBinary.java | 4 +- .../lib/rules/cpp/CppDebugPackageProvider.java | 80 ++++++++++++++++++++++ .../build/lib/rules/cpp/DebugPackageProvider.java | 77 --------------------- 3 files changed, 82 insertions(+), 79 deletions(-) create mode 100644 src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java delete mode 100644 src/main/java/com/google/devtools/build/lib/rules/cpp/DebugPackageProvider.java (limited to 'src') 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/CppDebugPackageProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java new file mode 100644 index 0000000000..31d3f9d81f --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java @@ -0,0 +1,80 @@ +// Copyright 2014 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.devtools.build.lib.rules.cpp; + +import com.google.common.base.Preconditions; +import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; +import com.google.devtools.build.lib.cmdline.Label; +import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; +import javax.annotation.Nullable; + +/** + * Provides the binary artifact and its associated .dwp files, if fission is enabled. If Fission + * ({@url https://gcc.gnu.org/wiki/DebugFission}) is not enabled, the dwp file will be null. + */ +@Immutable +@AutoCodec +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 CppDebugPackageProvider( + Label targetLabel, + Artifact strippedArtifact, + Artifact unstrippedArtifact, + @Nullable Artifact dwpArtifact) { + Preconditions.checkNotNull(strippedArtifact); + Preconditions.checkNotNull(unstrippedArtifact); + this.targetLabel = targetLabel; + this.strippedArtifact = strippedArtifact; + this.unstrippedArtifact = unstrippedArtifact; + this.dwpArtifact = dwpArtifact; + } + + /** + * Returns the label for the cc_binary target. + */ + public final Label getTargetLabel() { + return targetLabel; + } + + /** + * Returns the stripped file (the explicit ".stripped" target). + */ + public final Artifact getStrippedArtifact() { + return strippedArtifact; + } + + /** + * Returns the unstripped file (the default executable target). + */ + public final Artifact getUnstrippedArtifact() { + return unstrippedArtifact; + } + + /** + * Returns the .dwp file (for fission builds) or null if --fission=no. + */ + @Nullable + public final Artifact getDwpArtifact() { + return dwpArtifact; + } + +} 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/DebugPackageProvider.java deleted file mode 100644 index f287c5e719..0000000000 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/DebugPackageProvider.java +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright 2014 The Bazel Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.devtools.build.lib.rules.cpp; - -import com.google.common.base.Preconditions; -import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; -import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import javax.annotation.Nullable; - -/** - * Provides the binary artifact and its associated .dwp files, if fission is enabled. If Fission - * ({@url https://gcc.gnu.org/wiki/DebugFission}) is not enabled, the dwp file will be null. - */ -@Immutable -@AutoCodec -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 DebugPackageProvider( - Label targetLabel, - @Nullable Artifact strippedArtifact, - Artifact unstrippedArtifact, - @Nullable Artifact dwpArtifact) { - Preconditions.checkNotNull(unstrippedArtifact); - this.targetLabel = targetLabel; - this.strippedArtifact = strippedArtifact; - this.unstrippedArtifact = unstrippedArtifact; - this.dwpArtifact = dwpArtifact; - } - - /** Returns the label for the *_binary target. */ - public final Label getTargetLabel() { - return targetLabel; - } - - /** - * Returns the stripped file (the explicit ".stripped" target). - */ - public final Artifact getStrippedArtifact() { - return strippedArtifact; - } - - /** - * Returns the unstripped file (the default executable target). - */ - public final Artifact getUnstrippedArtifact() { - return unstrippedArtifact; - } - - /** - * Returns the .dwp file (for fission builds) or null if --fission=no. - */ - @Nullable - public final Artifact getDwpArtifact() { - return dwpArtifact; - } - -} -- cgit v1.2.3