From a4cf463814cc3a0dcffccd4c7038c494395c0998 Mon Sep 17 00:00:00 2001 From: tomlu Date: Fri, 9 Feb 2018 08:55:52 -0800 Subject: Make blaze stop passing --rule_kind to java tools. This argument is unused and should be removed. RELNOTES: None PiperOrigin-RevId: 185147327 --- .../devtools/build/lib/rules/android/AndroidCommon.java | 1 - .../google/devtools/build/lib/rules/java/JavaCommon.java | 1 - .../build/lib/rules/java/JavaCompilationHelper.java | 2 -- .../devtools/build/lib/rules/java/JavaCompileAction.java | 9 --------- .../build/lib/rules/java/JavaHeaderCompileAction.java | 10 ---------- .../build/lib/rules/java/JavaTargetAttributes.java | 15 --------------- 6 files changed, 38 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java index 2fbbe6db46..aae265a87e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java @@ -591,7 +591,6 @@ public class AndroidCommon { /*disableStrictDeps=*/ useDataBinding); helper.addLibrariesToAttributes(javaCommon.targetsTreatedAsDeps(ClasspathType.COMPILE_ONLY)); - attributes.setRuleKind(ruleContext.getRule().getRuleClass()); attributes.setTargetLabel(ruleContext.getLabel()); JavaCommon.validateConstraint( diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java index b2394ca51d..3628b72380 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java @@ -639,7 +639,6 @@ public class JavaCommon { addPlugins(javaTargetAttributes); - javaTargetAttributes.setRuleKind(ruleContext.getRule().getRuleClass()); javaTargetAttributes.setTargetLabel(ruleContext.getLabel()); return javaTargetAttributes; diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java index 09525dfc28..849b9d0595 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java @@ -227,7 +227,6 @@ public final class JavaCompilationHelper { builder.setStrictJavaDeps(attributes.getStrictJavaDeps()); builder.setDirectJars(attributes.getDirectJars()); builder.setCompileTimeDependencyArtifacts(attributes.getCompileTimeDependencyArtifacts()); - builder.setRuleKind(attributes.getRuleKind()); builder.setTargetLabel( attributes.getTargetLabel() == null ? ruleContext.getLabel() : attributes.getTargetLabel()); @@ -406,7 +405,6 @@ public final class JavaCompilationHelper { builder.setStrictJavaDeps(attributes.getStrictJavaDeps()); builder.setCompileTimeDependencyArtifacts(attributes.getCompileTimeDependencyArtifacts()); builder.setDirectJars(attributes.getDirectJars()); - builder.setRuleKind(attributes.getRuleKind()); builder.setTargetLabel(attributes.getTargetLabel()); builder.setAdditionalInputs(NestedSetBuilder.wrap(Order.LINK_ORDER, additionalJavaBaseInputs)); builder.setJavacJar(javaToolchain.getJavac()); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java index 9b2fde252d..42e8543517 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java @@ -492,7 +492,6 @@ public final class JavaCompileAction extends SpawnAction { private PathFragment classDirectory; private NestedSet processorPath = NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER); private final List processorNames = new ArrayList<>(); - private String ruleKind; private Label targetLabel; /** @@ -714,9 +713,6 @@ public final class JavaCompileAction extends SpawnAction { // terminate --javacopts with `--` to support javac flags that start with `--` result.add("--"); } - if (ruleKind != null) { - result.add("--rule_kind", ruleKind); - } if (targetLabel != null) { result.add("--target_label"); if (targetLabel.getPackageIdentifier().getRepository().isDefault() @@ -1000,11 +996,6 @@ public final class JavaCompileAction extends SpawnAction { return this; } - public Builder setRuleKind(String ruleKind) { - this.ruleKind = ruleKind; - return this; - } - public Builder setTargetLabel(Label targetLabel) { this.targetLabel = targetLabel; return this; diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java index 6cffa7b35a..8b8c72a925 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java @@ -189,7 +189,6 @@ public class JavaHeaderCompileAction extends SpawnAction { private NestedSet classpathEntries = NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER); private ImmutableList bootclasspathEntries = ImmutableList.of(); - @Nullable private String ruleKind; @Nullable private Label targetLabel; private PathFragment tempDirectory; private BuildConfiguration.StrictDepsMode strictJavaDeps @@ -285,12 +284,6 @@ public class JavaHeaderCompileAction extends SpawnAction { return this; } - /** Sets the kind of the build rule being compiled (e.g. {@code java_library}). */ - public Builder setRuleKind(@Nullable String ruleKind) { - this.ruleKind = ruleKind; - return this; - } - /** Sets the label of the target being compiled. */ public Builder setTargetLabel(@Nullable Label targetLabel) { this.targetLabel = targetLabel; @@ -555,9 +548,6 @@ public class JavaHeaderCompileAction extends SpawnAction { result.add("--"); } - if (ruleKind != null) { - result.add("--rule_kind", ruleKind); - } if (targetLabel != null) { result.add("--target_label"); if (targetLabel.getPackageIdentifier().getRepository().isDefault() diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java index 74f9948e18..89a10faad2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java @@ -93,7 +93,6 @@ public class JavaTargetAttributes { private final NestedSetBuilder directJars = NestedSetBuilder.naiveLinkOrder(); private final NestedSetBuilder compileTimeDependencyArtifacts = NestedSetBuilder.stableOrder(); - private String ruleKind; private Label targetLabel; private final NestedSetBuilder excludedArtifacts = @@ -176,12 +175,6 @@ public class JavaTargetAttributes { return this; } - public Builder setRuleKind(String ruleKind) { - Preconditions.checkArgument(!built); - this.ruleKind = ruleKind; - return this; - } - public Builder setTargetLabel(Label targetLabel) { Preconditions.checkArgument(!built); this.targetLabel = targetLabel; @@ -373,7 +366,6 @@ public class JavaTargetAttributes { additionalOutputs, directJars.build(), compileTimeDependencyArtifacts.build(), - ruleKind, targetLabel, excludedArtifacts, strictJavaDeps); @@ -444,7 +436,6 @@ public class JavaTargetAttributes { private final NestedSet directJars; private final NestedSet compileTimeDependencyArtifacts; - private final String ruleKind; private final Label targetLabel; private final NestedSet excludedArtifacts; @@ -470,7 +461,6 @@ public class JavaTargetAttributes { Set additionalOutputs, NestedSet directJars, NestedSet compileTimeDependencyArtifacts, - String ruleKind, Label targetLabel, NestedSetBuilder excludedArtifacts, BuildConfiguration.StrictDepsMode strictJavaDeps) { @@ -496,7 +486,6 @@ public class JavaTargetAttributes { this.classPathResources = ImmutableList.copyOf(classPathResources); this.additionalOutputs = ImmutableSet.copyOf(additionalOutputs); this.compileTimeDependencyArtifacts = compileTimeDependencyArtifacts; - this.ruleKind = ruleKind; this.targetLabel = targetLabel; this.excludedArtifacts = excludedArtifacts.build(); this.strictJavaDeps = strictJavaDeps; @@ -631,10 +620,6 @@ public class JavaTargetAttributes { return !messages.isEmpty(); } - public String getRuleKind() { - return ruleKind; - } - public Label getTargetLabel() { return targetLabel; } -- cgit v1.2.3