diff options
author | 2017-06-02 11:05:48 -0400 | |
---|---|---|
committer | 2017-06-05 10:18:07 -0400 | |
commit | 1cec6bb03fa9d8ecd77ec0c2b95078c5a4191c5d (patch) | |
tree | 04ed3a71f44dd3e8389d864a03e28a46299b6dd4 /src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java | |
parent | 956810b6ee24289e457a4b8d0a84ff56eb32c264 (diff) |
Remove "supports-workers" tag from ApkBuilder execution info.
The C++ implementation of SingleJar, which is available in Bazel, but not yet the default, doesn't support persistent worker mode, so this causes issues when you try to use it.
PiperOrigin-RevId: 157831362
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java index 96ed11b2d6..98511fe03f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.rules.android; 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.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; @@ -28,7 +27,6 @@ import com.google.devtools.build.lib.rules.java.Jvm; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.PathFragment; -import java.util.Map; /** * A class for coordinating APK building, signing and zipaligning. @@ -246,14 +244,11 @@ public class ApkActionsBuilder { * Registers generating actions for {@code outApk} that build an unsigned APK using SingleJar. */ private void buildApk(RuleContext ruleContext, Artifact outApk, String message) { - Map<String, String> executionInfo = ImmutableMap.of("supports-workers", "1"); - Artifact compressedApk = AndroidBinary.getDxArtifact(ruleContext, "compressed_" + outApk.getFilename()); SpawnAction.Builder compressedApkActionBuilder = new SpawnAction.Builder() .setMnemonic("ApkBuilder") .setProgressMessage(message) - .setExecutionInfo(executionInfo) .addArgument("--exclude_build_data") .addArgument("--compression") .addArgument("--normalize") @@ -302,7 +297,6 @@ public class ApkActionsBuilder { SpawnAction.Builder singleJarActionBuilder = new SpawnAction.Builder() .setMnemonic("ApkBuilder") .setProgressMessage(message) - .setExecutionInfo(executionInfo) .addArgument("--exclude_build_data") .addArgument("--dont_change_compression") .addArgument("--normalize") |