Simplified ActionContextConsumer by having it operate on a new class which holds a variety of strategy/context maps.

PiperOrigin-RevId: 190491357

1 files changed, 4 insertions, 8 deletions

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 64aaf908ad..08547c306f 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
@@ -16,10 +16,10 @@ package com.google.devtools.build.lib.sandbox;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Multimap;
 import com.google.devtools.build.lib.actions.ActionContext;
 import com.google.devtools.build.lib.actions.SpawnActionContext;
 import com.google.devtools.build.lib.exec.ActionContextConsumer;
+import com.google.devtools.build.lib.exec.SpawnActionContextMaps;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 
 /**
@@ -53,12 +53,8 @@ final class SandboxActionContextConsumer implements ActionContextConsumer {
   }
 
   @Override
-  public ImmutableMap<String, String> getSpawnActionContexts() {
-    return spawnContexts;
-  }
-
-  @Override
-  public Multimap<Class<? extends ActionContext>, String> getActionContexts() {
-    return contexts;
+  public void populate(SpawnActionContextMaps.Builder builder) {
+    builder.strategyByMnemonicMap().putAll(spawnContexts.entrySet());
+    builder.strategyByContextMap().putAll(contexts.entries());
   }
 }