Fix existing usages of persistent workers to include the new "supports-workers" execution info tag.

This is a new requirement which helps Blaze decide whether an action can be executed via workers or not.

--
MOS_MIGRATED_REVID=126279864

1 files changed, 13 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
index 6d5a36ff13..b176e81cc9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
@@ -26,6 +26,7 @@ import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
@@ -197,16 +198,18 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu
             args.build(),
             ParameterFile.ParameterFileType.UNQUOTED,
             ISO_8859_1));
-    SpawnAction.Builder dexbuilder = new SpawnAction.Builder()
-        .setExecutable(ruleContext.getExecutablePrerequisite(dexbuilderPrereq, Mode.HOST))
-        // WorkerSpawnStrategy expects the last argument to be @paramfile
-        .addArgument("@" + paramFile.getExecPathString())
-        .addInput(jar)
-        .addInput(paramFile)
-        .addOutput(dexArchive)
-        .setMnemonic("DexBuilder")
-        .setProgressMessage(
-            "Dexing " + jar.prettyPrint() + " with applicable dexopts " + incrementalDexopts);
+    SpawnAction.Builder dexbuilder =
+        new SpawnAction.Builder()
+            .setExecutable(ruleContext.getExecutablePrerequisite(dexbuilderPrereq, Mode.HOST))
+            // WorkerSpawnStrategy expects the last argument to be @paramfile
+            .addArgument("@" + paramFile.getExecPathString())
+            .addInput(jar)
+            .addInput(paramFile)
+            .addOutput(dexArchive)
+            .setMnemonic("DexBuilder")
+            .setExecutionInfo(ImmutableMap.of("supports-workers", "1"))
+            .setProgressMessage(
+                "Dexing " + jar.prettyPrint() + " with applicable dexopts " + incrementalDexopts);
     ruleContext.registerAction(dexbuilder.build(ruleContext));
   }