diff options
| author |  ulfjack <ulfjack@google.com> | 2018-02-20 09:48:10 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-20 09:50:06 -0800 |
| commit | d399df930e089f23390b09f42f4f5b47fce02977 (patch) | |
| tree | 47cec9cfbfd5f5ce69fdcbb6b14f7149574a96cb /src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java | |
| parent | b80158aca7f9cb99023e2f83effe2caefd0bb2d8 (diff) | |
Inject the product name in the constructor where needed
...instead of passing it everywhere so we can rewrite the local env.
PiperOrigin-RevId: 186316859
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java index 9c1a8343bf..f0b2070382 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java @@ -59,7 +59,7 @@ final class WorkerActionContextProvider extends ActionContextProvider { env.getOptions().getOptions(LocalExecutionOptions.class); LocalEnvProvider localEnvProvider = OS.getCurrent() == OS.DARWIN - ? new XCodeLocalEnvProvider(env.getClientEnv()) + ? new XCodeLocalEnvProvider(env.getRuntime().getProductName(), env.getClientEnv()) : (OS.getCurrent() == OS.WINDOWS ? new WindowsLocalEnvProvider(env.getClientEnv()) : new PosixLocalEnvProvider(env.getClientEnv())); @@ -67,7 +67,6 @@ final class WorkerActionContextProvider extends ActionContextProvider { env.getExecRoot(), localExecutionOptions, ResourceManager.instance(), - env.getRuntime().getProductName(), localEnvProvider); } |