2 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LocalGccStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LocalGccStrategy.java
index 6d3702f095..7b1cd6fef4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LocalGccStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LocalGccStrategy.java
@@ -20,7 +20,6 @@ import com.google.devtools.build.lib.actions.BaseSpawn;
 import com.google.devtools.build.lib.actions.ExecException;
 import com.google.devtools.build.lib.actions.ExecutionStrategy;
 import com.google.devtools.build.lib.actions.ResourceSet;
-import com.google.devtools.common.options.OptionsClassProvider;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -39,9 +38,6 @@ public class LocalGccStrategy implements CppCompileActionContext {
     }
   };
 
-  public LocalGccStrategy(OptionsClassProvider options) {
-  }
-
   @Override
   public String strategyLocality() {
     return "local";
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
index d0c2fc5e67..3fe423d18b 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
@@ -78,6 +78,7 @@ public class StandaloneContextProvider implements ActionContextProvider {
     TestActionContext testStrategy = new StandaloneTestStrategy(buildRequest,
         runtime.getStartupOptionsProvider(), runtime.getBinTools(), runtime.getClientEnv(),
         runtime.getWorkspace());
+
     Builder<ActionContext> strategiesBuilder = ImmutableList.builder();
     // order of strategies passed to builder is significant - when there are many strategies that
     // could potentially be used and a spawnActionContext doesn't specify which one it wants, the
@@ -89,16 +90,16 @@ public class StandaloneContextProvider implements ActionContextProvider {
           new LinuxSandboxedStrategy(runtime.getDirectories(), verboseFailures);
       strategiesBuilder.add(sandboxedLinuxStrategy);
     }
+
     strategiesBuilder.add(
         standaloneSpawnStrategy,
         new DummyIncludeScanningContext(),
         new LocalLinkStrategy(),
         testStrategy,
         new ExclusiveTestStrategy(testStrategy),
-        new LocalGccStrategy(buildRequest),
+        new LocalGccStrategy(),
         new FileWriteStrategy());
 
-
     this.strategies = strategiesBuilder.build();
   }
 
@@ -119,7 +120,8 @@ public class StandaloneContextProvider implements ActionContextProvider {
   }
 
   @Override
-  public void executionPhaseEnding()  {}
+  public void executionPhaseEnding() {
+  }
 }