diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
10 files changed, 0 insertions, 48 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(); } |