Remove the full client environment from BuildConfiguration in favor of computing the test environment as early as possible, and passing that along.

--
MOS_MIGRATED_REVID=91388451

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
index a70d1e109e..7a8789fb4c 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
@@ -77,7 +77,7 @@ public class StandaloneContextProvider implements ActionContextProvider {
     this.runtime = runtime;
 
     TestActionContext testStrategy = new StandaloneTestStrategy(buildRequest,
-        runtime.getStartupOptionsProvider(), runtime.getBinTools());
+        runtime.getStartupOptionsProvider(), runtime.getBinTools(), runtime.getClientEnv());
     Builder<ActionContext> strategiesBuilder = ImmutableList.builder();
     // order of strategies passed to builder is significant - when there are many strategies that
     // could potentially be used and a spawnActionContext doesn't specify which one it wants, the