diff options
author | 2016-09-08 13:47:10 +0000 | |
---|---|---|
committer | 2016-09-09 09:02:09 +0000 | |
commit | a85bf4b19c680a6db11f21758847dc88ec0aa658 (patch) | |
tree | 33408c64c3f0777852ec51ec5f5c12fa6c71fcc8 /src/main/java/com/google/devtools/build/lib/analysis/actions | |
parent | 8e62a7f29efcf60f9120598f670a6d54d652784c (diff) |
Implement input pruning using .d files in objc.
--
MOS_MIGRATED_REVID=132550233
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 | 13 |
2 files changed, 12 insertions, 5 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 2a797237ff..999f094430 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,7 +65,9 @@ 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; @@ -485,7 +487,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; @@ -495,7 +497,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; /** * Creates a SpawnAction builder. @@ -643,6 +645,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie tools, inputsAndTools, ImmutableList.copyOf(outputs), + resourceSet, actualCommandLine, ImmutableMap.copyOf(env), clientEnvironmentVariables, @@ -652,11 +655,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, |