diff options
author | Jon Brandvein <brandjon@google.com> | 2016-11-01 20:36:19 +0000 |
---|---|---|
committer | Laszlo Csomor <laszlocsomor@google.com> | 2016-11-02 08:27:11 +0000 |
commit | 6608579763be30493aaf20ab56acf8f3a9d1183f (patch) | |
tree | e19462b6037b34d462031a9e5653716e46059995 /src/main/java/com | |
parent | 3c84831081aecda512fc5ec3b08f9cb8c1ee6f98 (diff) |
Rollback, breaks dependent code.
--
MOS_MIGRATED_REVID=137864618
Diffstat (limited to 'src/main/java/com')
3 files changed, 6 insertions, 50 deletions
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 3222dd10f4..8ee985891e 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 @@ -426,20 +426,14 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie } /** - * A spawn instance that is tied to a specific SpawnAction. + * The Spawn which this SpawnAction will execute. */ - public class ActionSpawn extends BaseSpawn { + private class ActionSpawn extends BaseSpawn { private final List<Artifact> filesets = new ArrayList<>(); private final ImmutableMap<String, String> effectiveEnvironment; - /** - * Creates an ActionSpawn with the given environment variables. - * - * <p>Subclasses of SpawnAction may subclass in order to provide action-specific values for - * environment variables or action inputs. - */ public ActionSpawn(Map<String, String> clientEnv) { super(ImmutableList.copyOf(argv.arguments()), ImmutableMap.<String, String>of(), @@ -466,9 +460,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie effectiveEnvironment = ImmutableMap.copyOf(env); } - /** - * Creates an ActionSpawn with no environment variables. - */ public ActionSpawn() { this(null); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index 26e99863dc..8cad89d042 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -694,7 +694,6 @@ public final class CompilationSupport { ruleContext.registerAction( ObjcCompileAction.Builder.createObjcCompileActionBuilderWithAppleEnv( appleConfiguration, appleConfiguration.getSingleArchPlatform()) - .setHeaders(objcProvider.get(HEADER)) .setDotdPruningPlan(objcConfiguration.getDotdPruningPlan()) .setSourceFile(sourceFile) .addMandatoryInputs(swiftHeader.asSet()) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java index 9179e74c60..47c4ff1c6d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java @@ -21,16 +21,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionExecutionException; -import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactResolver; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.ResourceSet; -import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.analysis.actions.CommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.collect.nestedset.NestedSet; @@ -62,27 +59,10 @@ import java.util.Map; */ public class ObjcCompileAction extends SpawnAction { - /** - * A spawn that provides all headers to sandboxed execution to allow pruned headers to be - * re-introduced into action inputs. - */ - public class ObjcCompileActionSpawn extends ActionSpawn { - - public ObjcCompileActionSpawn(Map<String, String> clientEnv) { - super(clientEnv); - } - - @Override - public Iterable<? extends ActionInput> getInputFiles() { - return Iterables.concat(super.getInputFiles(), headers); - } - } - private final DotdFile dotdFile; private final Artifact sourceFile; private final NestedSet<Artifact> mandatoryInputs; private final HeaderDiscovery.DotdPruningMode dotdPruningPlan; - private final NestedSet<Artifact> headers; private static final String GUID = "a00d5bac-a72c-4f0f-99a7-d5fdc6072137"; @@ -103,8 +83,7 @@ public class ObjcCompileAction extends SpawnAction { DotdFile dotdFile, Artifact sourceFile, NestedSet<Artifact> mandatoryInputs, - HeaderDiscovery.DotdPruningMode dotdPruningPlan, - NestedSet<Artifact> headers) { + HeaderDiscovery.DotdPruningMode dotdPruningPlan) { super( owner, tools, @@ -125,7 +104,6 @@ public class ObjcCompileAction extends SpawnAction { this.sourceFile = sourceFile; this.mandatoryInputs = mandatoryInputs; this.dotdPruningPlan = dotdPruningPlan; - this.headers = headers; } /** Returns the DotdPruningPlan for this compile */ @@ -135,18 +113,14 @@ public class ObjcCompileAction extends SpawnAction { } @Override - public final Spawn getSpawn(Map<String, String> clientEnv) { - return new ObjcCompileActionSpawn(clientEnv); - } - - @Override public boolean discoversInputs() { return true; } @Override public Iterable<Artifact> discoverInputs(ActionExecutionContext actionExecutionContext) { - return headers; + // We do not use include scanning for objc + return null; } @Override @@ -251,7 +225,6 @@ public class ObjcCompileAction extends SpawnAction { private Artifact sourceFile; private final NestedSetBuilder<Artifact> mandatoryInputs = new NestedSetBuilder<>(STABLE_ORDER); private HeaderDiscovery.DotdPruningMode dotdPruningPlan; - private NestedSet<Artifact> headers; /** * Creates a new compile action builder with apple environment variables set that are typically @@ -320,12 +293,6 @@ public class ObjcCompileAction extends SpawnAction { return this; } - /** Sets the set of all possible headers that could be required by this compile action. */ - public Builder setHeaders(NestedSet<Artifact> headers) { - this.headers = Preconditions.checkNotNull(headers); - return this; - } - @Override protected SpawnAction createSpawnAction( ActionOwner owner, @@ -357,8 +324,7 @@ public class ObjcCompileAction extends SpawnAction { dotdFile, sourceFile, mandatoryInputs.build(), - dotdPruningPlan, - headers); + dotdPruningPlan); } } } |