aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Philipp Wollermann <philwo@google.com>2015-06-08 11:59:23 +0000
committerGravatar Laurent Le Brun <laurentlb@google.com>2015-06-08 12:54:29 +0000
commit988da682d87bc90cc1fef3cc09a7ef14f2d88c5a (patch)
tree4820f3e2b460f1cca9f2a56f71061664bb8a075e /src
parente18142dfb46f539dd14eece322ad2a60437eede6 (diff)
Remove unneeded parameter from LocalGccStrategy.
-- MOS_MIGRATED_REVID=95429195
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/LocalGccStrategy.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java8
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() {
+ }
}