aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules
diff options
context:
space:
mode:
authorGravatar Carmi Grushko <carmi@google.com>2016-11-17 23:21:20 +0000
committerGravatar Yun Peng <pcloudy@google.com>2016-11-18 10:54:43 +0000
commitc54545af80b41e6819767f9c6df2a6e01c2b25f4 (patch)
tree5f0d8e4e82eaa58152cda85ba7540ffe939c613d /src/main/java/com/google/devtools/build/lib/rules
parent41ad6ab0db585b49dafca9d4fca8fb8302709fd5 (diff)
Remove unused SupportData.getUsedDirectDeps().
-- MOS_MIGRATED_REVID=139514666
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java1
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java10
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java7
3 files changed, 1 insertions, 17 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java
index ea76e0a40a..f98de01ef9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java
@@ -55,7 +55,6 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory {
Predicates.<TransitiveInfoCollection>alwaysTrue() /* nonWeakDepsPredicate */,
protoSources,
transitiveImports,
- null /* usedDirectDeps */,
!protoSources.isEmpty());
Artifact descriptorSetOutput =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index f279be3d7f..951ba048b6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -213,11 +213,6 @@ public class ProtoCompileActionBuilder {
SpawnAction.Builder result =
new SpawnAction.Builder().addTransitiveInputs(supportData.getTransitiveImports());
- // We also depend on the strict protodeps result to ensure this is run.
- if (supportData.getUsedDirectDeps() != null) {
- result.addInput(supportData.getUsedDirectDeps());
- }
-
FilesToRunProvider langPluginTarget = getLangPluginTarget();
if (langPluginTarget != null) {
result.addTool(langPluginTarget);
@@ -391,11 +386,6 @@ public class ProtoCompileActionBuilder {
}
}
- // We also depend on the strict protodeps result to ensure this is run.
- if (supportData.getUsedDirectDeps() != null) {
- result.addInput(supportData.getUsedDirectDeps());
- }
-
FilesToRunProvider compilerTarget =
ruleContext.getExecutablePrerequisite(":proto_compiler", RuleConfiguredTarget.Mode.HOST);
if (ruleContext.hasErrors()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java b/src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java
index 4d29a265c8..762af4f7a3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/SupportData.java
@@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import javax.annotation.Nullable;
/**
* A helper class for the *Support classes containing some data from ProtoLibrary.
@@ -34,10 +33,9 @@ public abstract class SupportData {
Predicate<TransitiveInfoCollection> nonWeakDepsPredicate,
ImmutableList<Artifact> protoSources,
NestedSet<Artifact> transitiveImports,
- Artifact usedDirectDeps,
boolean hasProtoSources) {
return new AutoValue_SupportData(
- nonWeakDepsPredicate, protoSources, transitiveImports, usedDirectDeps, hasProtoSources);
+ nonWeakDepsPredicate, protoSources, transitiveImports, hasProtoSources);
}
public abstract Predicate<TransitiveInfoCollection> getNonWeakDepsPredicate();
@@ -46,9 +44,6 @@ public abstract class SupportData {
public abstract NestedSet<Artifact> getTransitiveImports();
- @Nullable
- public abstract Artifact getUsedDirectDeps();
-
public abstract boolean hasProtoSources();
SupportData() {}