diff options
| author |  felly <felly@google.com> | 2018-08-10 10:37:56 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-10 10:39:31 -0700 |
| commit | 2b3befd9746ffc8ed1a6f02bf260a91282fa489e (patch) | |
| tree | 300f1a2d551e108b190364851a96ada88baf5ffe /src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java | |
| parent | 20cf8a6b4ed9d06433ce2a57b91df96d849c546e (diff) | |
Automated rollback of commit 9374ecf94ce44e8bc56e68678cb512abf4cf9ce2.
*** Reason for rollback ***
Rollforward with deduplication of traversals and regression test.
RELNOTES: None
*** Original change description ***
Automated rollback of commit 39974a43abdd32e3a1acbc7da945b08da9983e4e.
*** Reason for rollback ***
b/112458627
*** Original change description ***
Allow skyframe-aware actions to pass partial results through ActionExecutionContext.
Remove FilesetProvider.
PiperOrigin-RevId: 208231719
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java index 3eebb2d037..0cccfb8345 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java @@ -55,7 +55,6 @@ import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.constraints.ConstraintSemantics; -import com.google.devtools.build.lib.analysis.fileset.FilesetProvider; import com.google.devtools.build.lib.analysis.platform.PlatformInfo; import com.google.devtools.build.lib.analysis.stringtemplate.TemplateContext; import com.google.devtools.build.lib.cmdline.Label; @@ -1555,9 +1554,12 @@ public final class RuleContext extends TargetContext } private boolean validateFilesetEntry(FilesetEntry filesetEntry, ConfiguredTargetAndData src) { - if (src.getConfiguredTarget().getProvider(FilesetProvider.class) != null) { + NestedSet<Artifact> filesToBuild = + src.getConfiguredTarget().getProvider(FileProvider.class).getFilesToBuild(); + if (filesToBuild.isSingleton() && Iterables.getOnlyElement(filesToBuild).isFileset()) { return true; } + if (filesetEntry.isSourceFileset()) { return true; } |