Use static final variables for spawn action resource sets.

PiperOrigin-RevId: 178100868

2 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 24a1de620d..781bc12058 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -91,6 +91,8 @@ public class AndroidCommon {
 
   public static final ImmutableSet<String> TRANSITIVE_ATTRIBUTES =
       ImmutableSet.of("deps", "exports");
+  private static final ResourceSet DEX_RESOURCE_SET =
+      ResourceSet.createWithRamCpuIo(4096.0, 5.0, 0.0);
 
   public static final <T extends TransitiveInfoProvider> Iterable<T> getTransitivePrerequisites(
       RuleContext ruleContext, Mode mode, final Class<T> classType) {
@@ -232,7 +234,7 @@ public class AndroidCommon {
             .setProgressMessage("Converting %s to dex format", jarToDex.getExecPathString())
             .setMnemonic("AndroidDexer")
             .addCommandLine(commandLine.build())
-            .setResources(ResourceSet.createWithRamCpuIo(4096.0, 5.0, 0.0));
+            .setResources(DEX_RESOURCE_SET);
     if (mainDexList != null) {
       builder.addInput(mainDexList);
     }
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 d41d99561e..e1efe0a969 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
@@ -49,6 +49,9 @@ public class DeployArchiveBuilder {
    */
   private static final String SINGLEJAR_MAX_MEMORY = "-Xmx1600m";
 
+  private static final ResourceSet DEPLOY_ACTION_RESOURCE_SET =
+      ResourceSet.createWithRamCpuIo(/*memoryMb = */ 200.0, /*cpuUsage = */ .2, /*ioUsage=*/ .2);
+
   private final RuleContext ruleContext;
 
   private final IterablesChain.Builder<Artifact> runtimeJarsBuilder = IterablesChain.builder();
@@ -367,8 +370,6 @@ public class DeployArchiveBuilder {
     }
 
     List<String> jvmArgs = ImmutableList.of(SINGLEJAR_MAX_MEMORY);
-    ResourceSet resourceSet =
-        ResourceSet.createWithRamCpuIo(/*memoryMb = */200.0, /*cpuUsage = */.2, /*ioUsage=*/.2);
 
     if (!usingNativeSinglejar) {
       ruleContext.registerAction(
@@ -376,7 +377,7 @@ public class DeployArchiveBuilder {
               .addTransitiveInputs(inputs.build())
               .addTransitiveInputs(JavaHelper.getHostJavabaseInputs(ruleContext))
               .addOutput(outputJar)
-              .setResources(resourceSet)
+              .setResources(DEPLOY_ACTION_RESOURCE_SET)
               .setJarExecutable(JavaCommon.getHostJavaExecutable(ruleContext), singlejar, jvmArgs)
               .addCommandLine(
                   commandLine,
@@ -390,7 +391,7 @@ public class DeployArchiveBuilder {
           new SpawnAction.Builder()
               .addTransitiveInputs(inputs.build())
               .addOutput(outputJar)
-              .setResources(resourceSet)
+              .setResources(DEPLOY_ACTION_RESOURCE_SET)
               .setExecutable(singlejar)
               .addCommandLine(
                   commandLine,