Make SpawnActions honor the client environment

...for the variables that supposed to be inherited from it. Note
That with this patch, we take the correct variables, but do not
yet track the dependency on changes to the client environment; this
will happen in a follow up patches.

Also add a test that demonstrates that the client environment rather
than that at startup is taken.

--
Change-Id: I4d33efa8eaf4f8b689c9b7f2130f71309f3343f0
Reviewed-on: https://bazel-review.googlesource.com/#/c/5392
MOS_MIGRATED_REVID=131406356

1 files changed, 4 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
index 3b02e119b6..09cf17600e 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
@@ -112,6 +112,10 @@ public class ActionExecutionContext {
     return executor;
   }
 
+  public ImmutableMap<String, String> getClientEnv() {
+    return clientEnv;
+  }
+
   public ArtifactExpander getArtifactExpander() {
     return artifactExpander;
   }