aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/standalone
diff options
context:
space:
mode:
authorGravatar Yue Gan <yueg@google.com>2016-08-29 15:14:59 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-08-29 15:37:40 +0000
commitd3f23179474c07d2df66f081a4e081e735de29cd (patch)
tree497366ee64df0a16584d4d83da760f2901907d6c /src/main/java/com/google/devtools/build/lib/standalone
parente0437b167ad7ea57c985a2fe63c1e22b4e7fb23a (diff)
modify sandbox script to allow default
-- Change-Id: I48611500044e05c177d3a044d5d335c4a98135f4 Reviewed-on: https://bazel-review.googlesource.com/#/c/5530 MOS_MIGRATED_REVID=131593454
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/standalone')
-rw-r--r--src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
index 04da210372..45cdafc902 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
@@ -35,7 +35,6 @@ import com.google.devtools.build.lib.util.OS;
import com.google.devtools.build.lib.util.OsUtils;
import com.google.devtools.build.lib.util.io.FileOutErr;
import com.google.devtools.build.lib.vfs.Path;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -149,18 +148,17 @@ public class StandaloneSpawnStrategy implements SpawnActionContext {
* Adds to the given environment all variables that are dependent on system state of the host
* machine.
*
- * <p> Admittedly, hermeticity is "best effort" in such cases; these environment values
- * should be as tied to configuration parameters as possible.
+ * <p>Admittedly, hermeticity is "best effort" in such cases; these environment values should be
+ * as tied to configuration parameters as possible.
*
- * <p>For example, underlying iOS toolchains require that SDKROOT resolve to an absolute
- * system path, but, when selecting which SDK to resolve, the version number comes from
- * build configuration.
+ * <p>For example, underlying iOS toolchains require that SDKROOT resolve to an absolute system
+ * path, but, when selecting which SDK to resolve, the version number comes from build
+ * configuration.
*
* @return the new environment, comprised of the old environment plus any new variables
- * @throws UserExecException if any variables dependent on system state could not be
- * resolved
+ * @throws UserExecException if any variables dependent on system state could not be resolved
*/
- private ImmutableMap<String, String> locallyDeterminedEnv(ImmutableMap<String, String> env)
+ public ImmutableMap<String, String> locallyDeterminedEnv(ImmutableMap<String, String> env)
throws UserExecException {
// TODO(bazel-team): Remove apple-specific logic from this class.
ImmutableMap.Builder<String, String> newEnvBuilder = ImmutableMap.builder();