diff options
author | 2018-04-13 03:03:03 -0700 | |
---|---|---|
committer | 2018-04-13 03:04:25 -0700 | |
commit | 0b11932efd128edc2283c7ae855d592c91987faf (patch) | |
tree | d491f7635b4be14d8a98aae15145a83da659d001 /src/main/java/com | |
parent | afc490381806ba66910d37b606a98818083ba36f (diff) |
Remove unused args from JavaSemantics#addProviders.
PiperOrigin-RevId: 192743013
Diffstat (limited to 'src/main/java/com')
5 files changed, 7 insertions, 36 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java index cb793323d9..281fc4a567 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java @@ -20,7 +20,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; @@ -571,15 +570,10 @@ public class BazelJavaSemantics implements JavaSemantics { } @Override - public void addProviders(RuleContext ruleContext, + public void addProviders( + RuleContext ruleContext, JavaCommon javaCommon, - List<String> jvmFlags, - Artifact classJar, - Artifact srcJar, - Artifact genJar, Artifact gensrcJar, - ImmutableMap<Artifact, Artifact> compilationToRuntimeJarMap, - NestedSetBuilder<Artifact> filesBuilder, RuleConfiguredTargetBuilder ruleBuilder) { if (!isJavaBinaryOrJavaTest(ruleContext)) { // TODO(plf): Figure out whether we can remove support for C++ dependencies in Bazel. diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java index 01124b60d4..678ba8da45 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java @@ -18,7 +18,6 @@ import static com.google.devtools.build.lib.rules.java.DeployArchiveBuilder.Comp import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.devtools.build.lib.actions.Artifact; @@ -302,9 +301,7 @@ public class JavaBinary implements RuleConfiguredTargetFactory { JavaPrimaryClassProvider.class, new JavaPrimaryClassProvider( semantics.getPrimaryClass(ruleContext, common.getSrcsArtifacts()))); - semantics.addProviders(ruleContext, common, jvmFlags, classJar, srcJar, - genClassJar, genSourceJar, ImmutableMap.<Artifact, Artifact>of(), - filesBuilder, builder); + semantics.addProviders(ruleContext, common, genSourceJar, builder); if (generatedExtensionRegistryProvider != null) { builder.add(GeneratedExtensionRegistryProvider.class, generatedExtensionRegistryProvider); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java index a4c3d9628a..0047ea27af 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java @@ -127,17 +127,7 @@ public class JavaImport implements RuleConfiguredTargetFactory { ImmutableBiMap<Artifact, Artifact> compilationToRuntimeJarMap = compilationToRuntimeJarMapBuilder.build(); - semantics.addProviders( - ruleContext, - common, - ImmutableList.<String>of(), - null /* classJar */, - srcJar /* srcJar */, - null /* genJar */, - null /* gensrcJar */, - compilationToRuntimeJarMap, - filesBuilder, - ruleBuilder); + semantics.addProviders(ruleContext, common, /* gensrcJar= */ null, ruleBuilder); NestedSet<Artifact> filesToBuild = filesBuilder.build(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java index c7663d084e..75fd868db7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.rules.java; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.analysis.ConfiguredTarget; @@ -189,10 +188,7 @@ public class JavaLibrary implements RuleConfiguredTargetFactory { RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(ruleContext); - semantics.addProviders( - ruleContext, common, ImmutableList.<String>of(), classJar, srcJar, - genClassJar, genSourceJar, ImmutableMap.<Artifact, Artifact>of(), - filesBuilder, builder); + semantics.addProviders(ruleContext, common, genSourceJar, builder); if (generatedExtensionRegistryProvider != null) { builder.add(GeneratedExtensionRegistryProvider.class, generatedExtensionRegistryProvider); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java index a7799e4f5d..07304f1ff6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java @@ -20,7 +20,6 @@ import static com.google.devtools.build.lib.packages.ImplicitOutputsFunction.fro import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Streams; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.LanguageDependentFragment.LibraryLanguage; @@ -419,15 +418,10 @@ public interface JavaSemantics { * Adds extra providers to a Java target. * @throws InterruptedException */ - void addProviders(RuleContext ruleContext, + void addProviders( + RuleContext ruleContext, JavaCommon javaCommon, - List<String> jvmFlags, - Artifact classJar, - Artifact srcJar, - Artifact genJar, Artifact gensrcJar, - ImmutableMap<Artifact, Artifact> compilationToRuntimeJarMap, - NestedSetBuilder<Artifact> filesBuilder, RuleConfiguredTargetBuilder ruleBuilder) throws InterruptedException; /** |