diff options
author | 2016-09-27 21:10:44 +0000 | |
---|---|---|
committer | 2016-09-28 08:28:05 +0000 | |
commit | ae3b6a93cd342d900e93a47efb9bbf0f1cd227f2 (patch) | |
tree | f51bc64abf594b253a9cc6144f9bea419819aa34 /src/main/java/com/google/devtools/build/lib/analysis/actions | |
parent | c5545fd0896f3c602a9be0986debed6f0c9c662d (diff) |
Implement input pruning using .d files in objc behind a flag that defaults to
false.
--
MOS_MIGRATED_REVID=134452391
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/actions')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/LTOBackendAction.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/LTOBackendAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/LTOBackendAction.java index c5dc74489d..06dd6e8c8a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/LTOBackendAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/LTOBackendAction.java @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactResolver; import com.google.devtools.build.lib.actions.PackageRootResolutionException; import com.google.devtools.build.lib.actions.PackageRootResolver; +import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -228,11 +229,12 @@ public final class LTOBackendAction extends SpawnAction { } @Override - SpawnAction createSpawnAction( + protected SpawnAction createSpawnAction( ActionOwner owner, NestedSet<Artifact> tools, NestedSet<Artifact> inputsAndTools, ImmutableList<Artifact> outputs, + ResourceSet resourceSet, CommandLine actualCommandLine, ImmutableMap<String, String> env, ImmutableSet<String> clientEnvironmentVariables, diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index 988e1d812e..5d8ad84e76 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -65,13 +65,13 @@ import javax.annotation.Nullable; /** An Action representing an arbitrary subprocess to be forked and exec'd. */ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifier, CommandAction { - private static class ExtraActionInfoSupplier<T> { + + /** Sets extensions on ExtraActionInfo **/ + protected static class ExtraActionInfoSupplier<T> { private final GeneratedExtension<ExtraActionInfo, T> extension; private final T value; - private ExtraActionInfoSupplier( - GeneratedExtension<ExtraActionInfo, T> extension, - T value) { + protected ExtraActionInfoSupplier(GeneratedExtension<ExtraActionInfo, T> extension, T value) { this.extension = extension; this.value = value; } @@ -495,7 +495,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie private ImmutableMap<String, String> executionInfo = ImmutableMap.of(); private boolean isShellCommand = false; private boolean useDefaultShellEnvironment = false; - private boolean executeUnconditionally; + protected boolean executeUnconditionally; private PathFragment executable; // executableArgs does not include the executable itself. private List<String> executableArgs; @@ -505,7 +505,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie private String progressMessage; private ParamFileInfo paramFileInfo = null; private String mnemonic = "Unknown"; - private ExtraActionInfoSupplier<?> extraActionInfoSupplier = null; + protected ExtraActionInfoSupplier<?> extraActionInfoSupplier = null; private boolean disableSandboxing = false; /** @@ -669,6 +669,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie tools, inputsAndTools, ImmutableList.copyOf(outputs), + resourceSet, actualCommandLine, ImmutableMap.copyOf(env), clientEnvironmentVariables, @@ -678,11 +679,13 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie mnemonic); } - SpawnAction createSpawnAction( + /** Creates a SpawnAction. */ + protected SpawnAction createSpawnAction( ActionOwner owner, NestedSet<Artifact> tools, NestedSet<Artifact> inputsAndTools, ImmutableList<Artifact> outputs, + ResourceSet resourceSet, CommandLine actualCommandLine, ImmutableMap<String, String> env, ImmutableSet<String> clientEnvironmentVariables, |