diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
16 files changed, 0 insertions, 84 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index c908bcda5d..ead89f63e3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -482,11 +482,6 @@ public class CppCompileAction extends AbstractAction implements IncludeScannable return cppCompileCommandLine.dotdFile; } - @Override - public String describeStrategy(Executor executor) { - return executor.getContext(actionContext).strategyLocality(); - } - @VisibleForTesting public CppCompilationContext getContext() { return context; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionContext.java index f0e423b37d..fe59f8e68b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionContext.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionContext.java @@ -70,11 +70,6 @@ public interface CppCompileActionContext extends ActionContext { ResourceSet estimateResourceConsumption(CppCompileAction action); /** - * Returns where the action actually runs. - */ - String strategyLocality(); - - /** * Returns whether include scanning needs to be run. */ boolean needsIncludeScanning(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java index c4b240cfb8..95d6379f18 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java @@ -287,11 +287,6 @@ public final class CppLinkAction extends AbstractAction { } } - @Override - public String describeStrategy(Executor executor) { - return fake ? "fake,local" : executor.getContext(CppLinkActionContext.class).strategyLocality(); - } - // Don't forget to update FAKE_LINK_GUID if you modify this method. @ThreadCompatible private void executeFake() diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionContext.java index 6e97cfc12a..cf64db187f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionContext.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionContext.java @@ -25,10 +25,6 @@ import com.google.devtools.build.lib.actions.ResourceSet; */ @ActionContextMarker(name = "C++ link") public interface CppLinkActionContext extends ActionContext { - /** - * Returns where the action actually runs. - */ - String strategyLocality(); /** * Returns the estimated resource consumption of the action. diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java index 36d8d7dc7c..82a3a16f69 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java @@ -55,11 +55,6 @@ final class ExtractInclusionAction extends AbstractAction { } @Override - public String describeStrategy(Executor executor) { - return executor.getContext(CppCompileActionContext.class).strategyLocality(); - } - - @Override public String getMnemonic() { return "GrepIncludes"; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java index b97f481964..b92e61496d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java @@ -216,11 +216,6 @@ public class FakeCppCompileAction extends CppCompileAction { public String getMnemonic() { return "FakeCppCompile"; } @Override - public String describeStrategy(Executor executor) { - return "fake"; - } - - @Override public ResourceSet estimateResourceConsumptionLocal() { return ResourceSet.createWithRamCpuIo(/*memoryMb=*/1, /*cpuUsage=*/0.1, /*ioUsage=*/0.0); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoStubAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoStubAction.java index 169f664780..bee74f7092 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoStubAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoStubAction.java @@ -38,11 +38,6 @@ public class FdoStubAction extends AbstractAction { } @Override - public String describeStrategy(Executor executor) { - return ""; - } - - @Override public void execute(ActionExecutionContext actionExecutionContext) { } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java index efe9b313e4..2e1dd42375 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java @@ -109,11 +109,6 @@ public final class SolibSymlinkAction extends AbstractAction { public String getMnemonic() { return "SolibSymlink"; } @Override - public String describeStrategy(Executor executor) { - return "local"; - } - - @Override protected String getRawProgressMessage() { return null; } /** diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java index 83cd41a6a5..4a97ce0e96 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java @@ -36,10 +36,6 @@ import java.util.Collection; name = {"spawn"} ) public class SpawnGccStrategy implements CppCompileActionContext { - @Override - public String strategyLocality() { - return "spawn"; - } @Override public boolean needsIncludeScanning() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java index b64c5a7b9c..f9d494be4b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java @@ -50,11 +50,6 @@ public final class SpawnLinkStrategy implements CppLinkActionContext { } @Override - public String strategyLocality() { - return "spawn"; - } - - @Override public ResourceSet estimateResourceConsumption(CppLinkAction action) { return action.estimateResourceConsumptionLocal(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java index f1a890877d..a436124a72 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java @@ -412,11 +412,6 @@ public class JavaCompileAction extends AbstractAction { } @Override - public String describeStrategy(Executor executor) { - return getContext(executor).strategyLocality(getMnemonic(), true); - } - - @Override public ResourceSet estimateResourceConsumption(Executor executor) { if (getContext(executor).isRemotable(getMnemonic(), true)) { return ResourceSet.ZERO; diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/ExclusiveTestStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/test/ExclusiveTestStrategy.java index b3b5fbd67c..8ee7f3efb7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/ExclusiveTestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/ExclusiveTestStrategy.java @@ -47,9 +47,4 @@ public class ExclusiveTestStrategy implements TestActionContext { Path execRoot, TestRunnerAction action, TestResultData cached) throws IOException { return parent.newCachedTestResult(execRoot, action, cached); } - - @Override - public String strategyLocality(TestRunnerAction testRunnerAction) { - return "exclusive"; - } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java index 59e752bf3d..1cddbf6791 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java @@ -266,9 +266,6 @@ public class StandaloneTestStrategy extends TestStrategy { } @Override - public String strategyLocality(TestRunnerAction action) { return "standalone"; } - - @Override public TestResult newCachedTestResult( Path execRoot, TestRunnerAction action, TestResultData data) { return new TestResult(action, data, /*cached*/ true); diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestActionContext.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestActionContext.java index 75cbc5bf79..68bf3cf9dd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/TestActionContext.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestActionContext.java @@ -34,11 +34,6 @@ public interface TestActionContext extends ActionContext { ActionExecutionContext actionExecutionContext) throws ExecException, InterruptedException; /** - * String describing where the action will run. - */ - String strategyLocality(TestRunnerAction action); - - /** * Creates a cached test result. */ TestResult newCachedTestResult(Path execRoot, TestRunnerAction action, TestResultData cached) diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java index 57ddcf9c56..9f09c90319 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java @@ -305,11 +305,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa return "Testing " + getTestName(); } - @Override - public String describeStrategy(Executor executor) { - return executor.getContext(TestActionContext.class).strategyLocality(this); - } - /** * Deletes <b>all</b> possible test outputs. * diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestStrategy.java index 93585bccf9..3275791cf1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/TestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestStrategy.java @@ -147,19 +147,6 @@ public abstract class TestStrategy implements TestActionContext { public abstract void exec(TestRunnerAction action, ActionExecutionContext actionExecutionContext) throws ExecException, InterruptedException; - @Override - public abstract String strategyLocality(TestRunnerAction action); - - /** - * Callback for determining the strategy locality. - * - * @param action the test action - * @param localRun whether to run it locally - */ - protected String strategyLocality(TestRunnerAction action, boolean localRun) { - return strategyLocality(action); - } - /** * Returns mutable map of default testing shell environment. By itself it is incomplete and is * modified further by the specific test strategy implementations (mostly due to the fact that |