diff options
Diffstat (limited to 'src/main/java/com/google')
5 files changed, 14 insertions, 16 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionContextConsumer.java b/src/main/java/com/google/devtools/build/lib/actions/ActionContextConsumer.java index 2308721e95..4c34fec5e3 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionContextConsumer.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionContextConsumer.java @@ -13,11 +13,10 @@ // limitations under the License. package com.google.devtools.build.lib.actions; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import com.google.devtools.build.lib.actions.Executor.ActionContext; -import java.util.Map; - /** * An object describing that actions require a particular implementation of an * {@link ActionContext}. @@ -53,7 +52,7 @@ public interface ActionContextConsumer { * present in the returned map. The easiest way to assure this is to use a map created using * {@code new TreeMap<>(String.CASE_INSENSITIVE_ORDER)}. */ - Map<String, String> getSpawnActionContexts(); + ImmutableMap<String, String> getSpawnActionContexts(); /** * Returns a map from action context class to the implementation required by the module. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java index a169f0c5a0..c4e9b7a780 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java @@ -93,15 +93,18 @@ public class BazelRulesModule extends BlazeModule { public List<Map.Entry<String, String>> strategy; } - private static class BazelActionContextConsumer implements ActionContextConsumer { - BazelExecutionOptions options; + /** + * An object describing the {@link ActionContext} implementation that some actions require in + * Bazel. + */ + protected static class BazelActionContextConsumer implements ActionContextConsumer { + private final BazelExecutionOptions options; - private BazelActionContextConsumer(BazelExecutionOptions options) { + protected BazelActionContextConsumer(BazelExecutionOptions options) { this.options = options; - } @Override - public Map<String, String> getSpawnActionContexts() { + public ImmutableMap<String, String> getSpawnActionContexts() { Map<String, String> contexts = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); contexts.put("Genrule", options.genruleStrategy); @@ -136,7 +139,7 @@ public class BazelRulesModule extends BlazeModule { } private CommandEnvironment env; - private BazelExecutionOptions options; + protected BazelExecutionOptions options; @Override public void beforeCommand(Command command, CommandEnvironment env) { diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java index 2d1e52c08d..1f54bcc0b5 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java @@ -207,7 +207,7 @@ public class ExecutionTool { // that actually depends on them. new ActionContextConsumer() { @Override - public Map<String, String> getSpawnActionContexts() { + public ImmutableMap<String, String> getSpawnActionContexts() { return ImmutableMap.of(); } diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java index 4041fd9a4c..2d6e28e562 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java @@ -22,8 +22,6 @@ import com.google.devtools.build.lib.actions.Executor.ActionContext; import com.google.devtools.build.lib.actions.SpawnActionContext; import com.google.devtools.build.lib.util.OS; -import java.util.Map; - /** * {@link ActionContextConsumer} that requests the action contexts necessary for sandboxed * execution. @@ -31,7 +29,7 @@ import java.util.Map; public class SandboxActionContextConsumer implements ActionContextConsumer { @Override - public Map<String, String> getSpawnActionContexts() { + public ImmutableMap<String, String> getSpawnActionContexts() { return ImmutableMap.of(); } diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextConsumer.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextConsumer.java index 7173136d15..91d278b174 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextConsumer.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextConsumer.java @@ -21,8 +21,6 @@ import com.google.devtools.build.lib.actions.ActionContextConsumer; import com.google.devtools.build.lib.actions.Executor.ActionContext; import com.google.devtools.build.lib.actions.SpawnActionContext; -import java.util.Map; - /** * {@link ActionContextConsumer} that requests the action contexts necessary for worker process * execution. @@ -30,7 +28,7 @@ import java.util.Map; public class WorkerActionContextConsumer implements ActionContextConsumer { @Override - public Map<String, String> getSpawnActionContexts() { + public ImmutableMap<String, String> getSpawnActionContexts() { return ImmutableMap.of(); } |