aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar cushon <cushon@google.com>2018-02-22 18:23:18 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-22 18:25:18 -0800
commit00c317b1677ee817c4534497e1e0f88b2ae0a40d (patch)
treebff6d6affd2f53e639209ede45e0fa5d4fe9b858 /src
parentec77ac96f18bd2cc230f37768130cb215475177f (diff)
Remove support for --rule_kind
now that Bazel no longer passes it. PiperOrigin-RevId: 186708415
Diffstat (limited to 'src')
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java3
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java8
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java21
3 files changed, 0 insertions, 32 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
index 01ba5f1cd9..101d8b6c0b 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
@@ -132,9 +132,6 @@ public final class JavaLibraryBuildRequest {
if (optionsParser.reduceClasspath()) {
depsBuilder.setReduceClasspath();
}
- if (optionsParser.getRuleKind() != null) {
- depsBuilder.setRuleKind(optionsParser.getRuleKind());
- }
if (optionsParser.getTargetLabel() != null) {
depsBuilder.setTargetLabel(optionsParser.getTargetLabel());
}
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
index 7646ebeb00..8eb700d829 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
@@ -82,7 +82,6 @@ public final class OptionsParser {
private boolean compressJar;
- private String ruleKind;
private String targetLabel;
private String injectingRuleKind;
@@ -216,9 +215,6 @@ public final class OptionsParser {
case "--compress_jar":
compressJar = true;
break;
- case "--rule_kind":
- ruleKind = getArgument(argQueue, arg);
- break;
case "--target_label":
targetLabel = getArgument(argQueue, arg);
break;
@@ -524,10 +520,6 @@ public final class OptionsParser {
return compressJar;
}
- public String getRuleKind() {
- return ruleKind;
- }
-
public String getTargetLabel() {
return targetLabel;
}
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
index 2428245f91..80842ffaca 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
@@ -78,7 +78,6 @@ public final class DependencyModule {
private final ImmutableMap<Path, JarOwner> jarsToTargets;
private final boolean strictClasspathMode;
private final Set<Path> depsArtifacts;
- private final String ruleKind;
private final String targetLabel;
private final Path outputDepsProtoFile;
private final Set<Path> usedClasspath;
@@ -98,7 +97,6 @@ public final class DependencyModule {
boolean strictClasspathMode,
Set<Path> depsArtifacts,
ImmutableSet<Path> platformJars,
- String ruleKind,
String targetLabel,
Path outputDepsProtoFile,
FixMessage fixMessage,
@@ -109,7 +107,6 @@ public final class DependencyModule {
this.jarsToTargets = jarsToTargets;
this.strictClasspathMode = strictClasspathMode;
this.depsArtifacts = depsArtifacts;
- this.ruleKind = ruleKind;
this.targetLabel = targetLabel;
this.outputDepsProtoFile = outputDepsProtoFile;
this.explicitDependenciesMap = new HashMap<>();
@@ -217,11 +214,6 @@ public final class DependencyModule {
return packages.add(packge);
}
- /** Returns the type (rule kind) of the originating target. */
- public String getRuleKind() {
- return ruleKind;
- }
-
/** Returns the name (label) of the originating target. */
public String getTargetLabel() {
return targetLabel;
@@ -349,7 +341,6 @@ public final class DependencyModule {
private ImmutableMap<Path, JarOwner> jarsToTargets = ImmutableMap.of();
private final Set<Path> depsArtifacts = new HashSet<>();
private ImmutableSet<Path> platformJars = ImmutableSet.of();
- private String ruleKind;
private String targetLabel;
private Path outputDepsProtoFile;
private boolean strictClasspathMode = false;
@@ -388,7 +379,6 @@ public final class DependencyModule {
strictClasspathMode,
depsArtifacts,
platformJars,
- ruleKind,
targetLabel,
outputDepsProtoFile,
fixMessage,
@@ -418,17 +408,6 @@ public final class DependencyModule {
}
/**
- * Sets the type (rule kind) of the originating target.
- *
- * @param ruleKind kind, such as the rule kind of a RuleConfiguredTarget
- * @return this Builder instance
- */
- public Builder setRuleKind(String ruleKind) {
- this.ruleKind = ruleKind;
- return this;
- }
-
- /**
* Sets the name (label) of the originating target.
*
* @param targetLabel label, such as the label of a RuleConfiguredTarget.