Automated [] rollback of commit e898023.

*** Reason for rollback ***

Make darwin sandboxing default again.

*** Original change description ***

Fix bazelbuild#1849: Sandboxing on OS X should be turned off by default for 0.3.2.

This restructures the way we set the default Spawn strategy so that each BlazeModule supplying a SpawnActionContext has an ActionContextConsumer that sets its own SpawnActionContext as the default, with the BazelRulesModule being put as the last module loaded in BazelMain, so that it can override that decision - it only does, if the user explicitly specifies a --spawn_strategy flag. IMHO this is a much saner approach than...

***

ROLLBACK_OF=134770427

RELNOTES: Darwin sandboxing is default.

--
MOS_MIGRATED_REVID=135905657

src/main/java/com/google/devtools/build/lib/bazel/BazelMain.java

@@ -18,6 +18,7 @@
 import com.google.devtools.build.lib.analysis.BlazeVersionInfo;
 import com.google.devtools.build.lib.runtime.BlazeModule;
 import com.google.devtools.build.lib.runtime.BlazeRuntime;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
@@ -42,13 +43,13 @@ public final class BazelMain {
           com.google.devtools.build.lib.bazel.BazelDiffAwarenessModule.class,
           com.google.devtools.build.lib.bazel.BazelRepositoryModule.class,
           com.google.devtools.build.lib.bazel.dash.DashModule.class,
+          com.google.devtools.build.lib.bazel.rules.BazelRulesModule.class,
           com.google.devtools.build.lib.ssd.SsdModule.class,
           com.google.devtools.build.lib.worker.WorkerModule.class,
           com.google.devtools.build.lib.remote.RemoteModule.class,
           com.google.devtools.build.lib.standalone.StandaloneModule.class,
           com.google.devtools.build.lib.sandbox.SandboxModule.class,
-          com.google.devtools.build.lib.runtime.BuildSummaryStatsModule.class,
-          com.google.devtools.build.lib.bazel.rules.BazelRulesModule.class);
+          com.google.devtools.build.lib.runtime.BuildSummaryStatsModule.class);
 
   public static void main(String[] args) {
     BlazeVersionInfo.setBuildInfo(tryGetBuildInfo());

src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java

@@ -16,17 +16,25 @@
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.Multimap;
 import com.google.common.eventbus.Subscribe;
 import com.google.devtools.build.lib.actions.ActionContextConsumer;
 import com.google.devtools.build.lib.actions.ActionContextProvider;
+import com.google.devtools.build.lib.actions.Executor.ActionContext;
 import com.google.devtools.build.lib.actions.SimpleActionContextProvider;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
+import com.google.devtools.build.lib.analysis.actions.FileWriteActionContext;
 import com.google.devtools.build.lib.bazel.rules.cpp.BazelCppRuleClasses;
 import com.google.devtools.build.lib.query2.output.OutputFormatter;
 import com.google.devtools.build.lib.rules.android.WriteAdbArgsActionContext;
+import com.google.devtools.build.lib.rules.cpp.CppCompileActionContext;
+import com.google.devtools.build.lib.rules.cpp.CppLinkActionContext;
 import com.google.devtools.build.lib.rules.cpp.FdoSupportFunction;
 import com.google.devtools.build.lib.rules.cpp.FdoSupportValue;
+import com.google.devtools.build.lib.rules.cpp.IncludeScanningContext;
 import com.google.devtools.build.lib.rules.genquery.GenQuery;
 import com.google.devtools.build.lib.runtime.BlazeModule;
 import com.google.devtools.build.lib.runtime.Command;
@@ -41,6 +49,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * Module implementing the rule set of Bazel.
@@ -83,6 +92,54 @@ public static class BazelExecutionOptions extends OptionsBase {
     public List<Map.Entry<String, String>> strategy;
   }
 
+  /**
+   * An object describing the {@link ActionContext} implementation that some actions require in
+   * Bazel.
+   */
+  protected static class BazelActionContextConsumer implements ActionContextConsumer {
+    private final BazelExecutionOptions options;
+
+    protected BazelActionContextConsumer(BazelExecutionOptions options) {
+      this.options = options;
+    }
+    @Override
+    public ImmutableMap<String, String> getSpawnActionContexts() {
+      Map<String, String> contexts = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+
+      // Default strategies for certain mnemonics - they can be overridden by --strategy= flags.
+      contexts.put("Javac", "worker");
+
+      contexts.put("Genrule", options.genruleStrategy);
+
+      for (Map.Entry<String, String> strategy : options.strategy) {
+        String strategyName = strategy.getValue();
+        // TODO(philwo) - remove this when the standalone / local mess is cleaned up.
+        // Some flag expansions use "local" as the strategy name, but the strategy is now called
+        // "standalone", so we'll translate it here.
+        if (strategyName.equals("local")) {
+          strategyName = "standalone";
+        }
+        contexts.put(strategy.getKey(), strategyName);
+      }
+
+      // TODO(bazel-team): put this in getActionContexts (key=SpawnActionContext.class) instead
+      contexts.put("", options.spawnStrategy);
+
+      return ImmutableMap.copyOf(contexts);
+    }
+
+    @Override
+    public Multimap<Class<? extends ActionContext>, String> getActionContexts() {
+      return ImmutableMultimap.<Class<? extends ActionContext>, String>builder()
+          .put(CppCompileActionContext.class, "")
+          .put(CppLinkActionContext.class, "")
+          .put(IncludeScanningContext.class, "")
+          .put(FileWriteActionContext.class, "")
+          .put(WriteAdbArgsActionContext.class, "")
+          .build();
+    }
+  }
+
   private CommandEnvironment env;
   protected BazelExecutionOptions options;
 
@@ -113,7 +170,8 @@ public Iterable<ActionContextProvider> getActionContextProviders() {
 
   @Override
   public Iterable<ActionContextConsumer> getActionContextConsumers() {
-    return ImmutableList.<ActionContextConsumer>of(new BazelActionContextConsumer(options));
+    return ImmutableList.<ActionContextConsumer>of(
+        new BazelActionContextConsumer(options));
   }
 
   @Subscribe

src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java

@@ -30,33 +30,22 @@
 final class SandboxActionContextConsumer implements ActionContextConsumer {
 
   private final ImmutableMultimap<Class<? extends ActionContext>, String> contexts;
-  private final ImmutableMap<String, String> spawnContexts;
 
   public SandboxActionContextConsumer(CommandEnvironment env) {
     ImmutableMultimap.Builder<Class<? extends ActionContext>, String> contexts =
         ImmutableMultimap.builder();
-    ImmutableMap.Builder<String, String> spawnContexts = ImmutableMap.builder();
 
-    // This makes the "sandboxed" strategy available via --spawn_strategy=sandboxed,
-    // but it is not necessarily the default.
     if ((OS.getCurrent() == OS.LINUX && LinuxSandboxedStrategy.isSupported(env))
         || (OS.getCurrent() == OS.DARWIN && DarwinSandboxRunner.isSupported())) {
       contexts.put(SpawnActionContext.class, "sandboxed");
-
-      // This makes the "sandboxed" strategy the default Spawn strategy on Linux, unless it is
-      // overridden by a later BlazeModule.
-      if (OS.getCurrent() == OS.LINUX) {
-        spawnContexts.put("", "sandboxed");
-      }
     }
 
     this.contexts = contexts.build();
-    this.spawnContexts = spawnContexts.build();
   }
 
   @Override
   public ImmutableMap<String, String> getSpawnActionContexts() {
-    return spawnContexts;
+    return ImmutableMap.of();
   }
 
   @Override

src/main/java/com/google/devtools/build/lib/standalone/StandaloneModule.java

@@ -15,14 +15,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.eventbus.Subscribe;
-import com.google.devtools.build.lib.actions.ActionContextConsumer;
 import com.google.devtools.build.lib.actions.ActionContextProvider;
 import com.google.devtools.build.lib.buildtool.BuildRequest;
 import com.google.devtools.build.lib.buildtool.buildevent.BuildStartingEvent;
 import com.google.devtools.build.lib.runtime.BlazeModule;
 import com.google.devtools.build.lib.runtime.Command;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
-import com.google.devtools.build.lib.util.Preconditions;
 
 /**
  * StandaloneModule provides pluggable functionality for blaze.
@@ -31,12 +29,6 @@ public class StandaloneModule extends BlazeModule {
   private CommandEnvironment env;
   private BuildRequest buildRequest;
 
-  @Override
-  public Iterable<ActionContextConsumer> getActionContextConsumers() {
-    Preconditions.checkNotNull(env);
-    return ImmutableList.<ActionContextConsumer>of(new StandaloneActionContextConsumer());
-  }
-
   @Override
   public Iterable<ActionContextProvider> getActionContextProviders() {
     return ImmutableList.<ActionContextProvider>of(

src/test/shell/bazel/bazel_sandboxing_test.sh

@@ -222,7 +222,7 @@ function test_sandbox_cleanup() {
   bazel build examples/genrule:tools_work &> $TEST_log \
     || fail "Hermetic genrule failed: examples/genrule:tools_work"
   bazel shutdown &> $TEST_log || fail "bazel shutdown failed"
-  if [[ -n "$(ls -A "$(bazel info output_base)/bazel-sandbox")" ]]; then
+  if [[ "$(ls -la "$(bazel info output_base)/bazel-sandbox")" ]]; then
     fail "Build left files around afterwards"
   fi
 }