From 561290374615425fc6bf7be6c7631fa3baca75b9 Mon Sep 17 00:00:00 2001 From: elenairina Date: Fri, 24 Nov 2017 02:30:22 -0800 Subject: Remove usages of $singlejar in Java rules. The "$singlejar" attribute was removed in unknown commit. PiperOrigin-RevId: 176826579 --- .../devtools/build/lib/rules/java/DeployArchiveBuilder.java | 12 +----------- .../build/lib/rules/java/ResourceJarActionBuilder.java | 4 ---- .../build/lib/rules/java/SingleJarActionBuilder.java | 12 +----------- 3 files changed, 2 insertions(+), 26 deletions(-) (limited to 'src/main/java/com/google/devtools/build') diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java index e1eb23b83e..d41d99561e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java @@ -29,7 +29,6 @@ import com.google.devtools.build.lib.analysis.actions.CommandLine; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.ParamFileInfo; import com.google.devtools.build.lib.analysis.actions.SpawnAction; -import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.collect.IterablesChain; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -345,7 +344,7 @@ public class DeployArchiveBuilder { // If singlejar's name ends with .jar, it is Java application, otherwise it is native. // TODO(asmundak): once https://github.com/bazelbuild/bazel/issues/2241 is fixed (that is, // the native singlejar is used on windows) remove support for the Java implementation - Artifact singlejar = getSingleJar(ruleContext); + Artifact singlejar = JavaToolchainProvider.from(ruleContext).getSingleJar(); boolean usingNativeSinglejar = !singlejar.getFilename().endsWith(".jar"); CommandLine commandLine = @@ -401,13 +400,4 @@ public class DeployArchiveBuilder { .build(ruleContext)); } } - - /** Returns the SingleJar deploy jar Artifact. */ - private static Artifact getSingleJar(RuleContext ruleContext) { - Artifact singleJar = JavaToolchainProvider.from(ruleContext).getSingleJar(); - if (singleJar != null) { - return singleJar; - } - return ruleContext.getPrerequisiteArtifact("$singlejar", Mode.HOST); - } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java index 7bf1924c83..be3dafcfbd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.ParamFileInfo; import com.google.devtools.build.lib.analysis.actions.SpawnAction; -import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -88,9 +87,6 @@ public class ResourceJarActionBuilder { checkNotNull(javaToolchain, "javaToolchain must not be null"); Artifact singleJar = javaToolchain.getSingleJar(); - if (singleJar == null) { - singleJar = ruleContext.getPrerequisiteArtifact("$singlejar", Mode.HOST); - } SpawnAction.Builder builder = new SpawnAction.Builder(); if (singleJar.getFilename().endsWith(".jar")) { builder diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/SingleJarActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/SingleJarActionBuilder.java index f857d94043..61ee42d124 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/SingleJarActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/SingleJarActionBuilder.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg; import com.google.devtools.build.lib.analysis.actions.ParamFileInfo; import com.google.devtools.build.lib.analysis.actions.SpawnAction; -import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import javax.annotation.Nullable; @@ -47,7 +46,7 @@ public final class SingleJarActionBuilder { /** Constructs the base spawn for a singlejar action. */ private static SpawnAction.Builder singleJarActionBuilder(RuleContext ruleContext) { - Artifact singleJar = getSingleJar(ruleContext); + Artifact singleJar = JavaToolchainProvider.from(ruleContext).getSingleJar(); SpawnAction.Builder builder = new SpawnAction.Builder(); // If singlejar's name ends with .jar, it is Java application, otherwise it is native. // TODO(asmundak): once https://github.com/bazelbuild/bazel/issues/2241 is fixed (that is, @@ -124,15 +123,6 @@ public final class SingleJarActionBuilder { ruleContext.registerAction(builder.build(ruleContext)); } - /** Returns the SingleJar deploy jar Artifact. */ - private static Artifact getSingleJar(RuleContext ruleContext) { - Artifact singleJar = JavaToolchainProvider.from(ruleContext).getSingleJar(); - if (singleJar != null) { - return singleJar; - } - return ruleContext.getPrerequisiteArtifact("$singlejar", Mode.HOST); - } - private static CommandLine sourceJarCommandLine( Artifact outputJar, JavaSemantics semantics, -- cgit v1.2.3