aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google
diff options
context:
space:
mode:
authorGravatar lberki <lberki@google.com>2017-08-24 14:20:11 +0200
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-08-24 17:43:13 +0200
commitb4a1bb96c5b5802dd920b1f971e248bcc737680c (patch)
tree7a637a5029d3c30d0a087a4272ebaedc59ac5545 /src/main/java/com/google
parent097baed566ccb246ba7c748e256a429e27b7420f (diff)
Extract a string constant into a final field.
PiperOrigin-RevId: 166329484
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java3
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java4
2 files changed, 5 insertions, 2 deletions
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 79475b22dd..3490db77d7 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
@@ -86,7 +86,8 @@ public class JavaCommon {
ActionAnalysisMetadata action = analysisEnvironment.getLocalGeneratingAction(artifact);
if (action instanceof JavaCompileAction) {
addOutputs(metadataFilesBuilder, action, JavaSemantics.COVERAGE_METADATA);
- } else if (action != null && action.getMnemonic().equals("JavaResourceJar")) {
+ } else if (action != null
+ && action.getMnemonic().equals(ResourceJarActionBuilder.MNEMONIC)) {
// recurse on resource jar actions
collectMetadataArtifacts(
action.getInputs(), analysisEnvironment, metadataFilesBuilder);
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 af7d5968d3..0d9cf42e02 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
@@ -35,6 +35,8 @@ import java.util.Map;
/** Builds the action to package the resources for a Java rule into a jar. */
public class ResourceJarActionBuilder {
+ public static final String MNEMONIC = "JavaResourceJar";
+
private Artifact outputJar;
private Map<PathFragment, Artifact> resources = ImmutableMap.of();
private NestedSet<Artifact> resourceJars = NestedSetBuilder.emptySet(Order.STABLE_ORDER);
@@ -141,7 +143,7 @@ public class ResourceJarActionBuilder {
.addInputs(classpathResources)
.setCommandLine(command.build())
.setProgressMessage("Building Java resource jar")
- .setMnemonic("JavaResourceJar")
+ .setMnemonic(MNEMONIC)
.build(ruleContext));
}