aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2015-07-29 14:33:24 +0000
committerGravatar Lukacs Berki <lberki@google.com>2015-07-29 16:03:24 +0000
commita0345bce94607a7096777d9013eed4c08cf12edc (patch)
treeb9e26fc404a96a93526a207caa72c3d8658143a4 /src/main/java/com/google/devtools/build
parentc68faf184631759724386aa53747bcdff03f5ed7 (diff)
Remove some dead code given that cc_public_library is gone.
-- MOS_MIGRATED_REVID=99373396
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java12
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java2
2 files changed, 1 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index a19e05feed..95f86a6f40 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -21,7 +21,6 @@ import com.google.common.collect.Maps;
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
-import com.google.devtools.build.lib.analysis.AnalysisUtils;
import com.google.devtools.build.lib.analysis.FileProvider;
import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -163,9 +162,6 @@ public final class CcCommon {
if (ruleContext.attributes().has("malloc", Type.LABEL)) {
deps.add(CppHelper.mallocForTarget(ruleContext));
}
- if (ruleContext.attributes().has("implementation", Type.LABEL_LIST)) {
- deps.addAll(ruleContext.getPrerequisites("implementation", Mode.TARGET));
- }
return compilationOutputs == null // Possible in LIPO collection mode (see initializationHook).
? DwoArtifactsCollector.emptyCollector()
@@ -180,14 +176,6 @@ public final class CcCommon {
NestedSetBuilder<IncludeScannable> scannableBuilder = NestedSetBuilder.stableOrder();
CppHelper.addTransitiveLipoInfoForCommonAttributes(ruleContext, outputs, scannableBuilder);
- if (hasAttribute("implementation", Type.LABEL_LIST)) {
- for (TransitiveLipoInfoProvider impl : AnalysisUtils.getProviders(
- ruleContext.getPrerequisites("implementation", Mode.TARGET),
- TransitiveLipoInfoProvider.class)) {
- scannableBuilder.addTransitive(impl.getTransitiveIncludeScannables());
- }
- }
-
return new TransitiveLipoInfoProvider(scannableBuilder.build());
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
index 98a6568a9f..a7fc64ef9a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
@@ -55,7 +55,7 @@ public class CppRuleClasses {
*/
static final InstrumentationSpec INSTRUMENTATION_SPEC = new InstrumentationSpec(
FileTypeSet.of(CPP_SOURCE, C_SOURCE, CPP_HEADER, ASSEMBLER_WITH_C_PREPROCESSOR),
- "srcs", "deps", "data", "hdrs", "implements", "implementation");
+ "srcs", "deps", "data", "hdrs");
public static final LibraryLanguage LANGUAGE = new LibraryLanguage("C++");