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/exec/apple | |
| 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/exec/apple')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java index b0acfbf4b4..553fef0039 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java +++ b/src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java @@ -47,6 +47,7 @@ public final class XCodeLocalEnvProvider implements LocalEnvProvider { private static final String XCRUN_CACHE_FILENAME = "__xcruncache"; private static final String XCODE_LOCATOR_CACHE_FILENAME = "__xcodelocatorcache"; + private final String productName; private final Map<String, String> clientEnv; /** @@ -54,13 +55,14 @@ public final class XCodeLocalEnvProvider implements LocalEnvProvider { * * @param clientEnv a map of the current Bazel command's environment */ - public XCodeLocalEnvProvider(Map<String, String> clientEnv) { + public XCodeLocalEnvProvider(String productName, Map<String, String> clientEnv) { + this.productName = productName; this.clientEnv = clientEnv; } @Override public Map<String, String> rewriteLocalEnv( - Map<String, String> env, Path execRoot, String fallbackTmpDir, String productName) + Map<String, String> env, Path execRoot, String fallbackTmpDir) throws IOException { boolean containsXcodeVersion = env.containsKey(AppleConfiguration.XCODE_VERSION_ENV_NAME); boolean containsAppleSdkVersion = |