Remove the undocumented --experimental_extra_action_top_level_only_with_aspects command line option.
It was introduced in November 2016 as an escape hatch, and has not been used in the last two months so it's safe to remove.
RELNOTES: None.
@@ -222,18 +222,6 @@ public class BuildView {
)
public boolean extraActionTopLevelOnly;
- @Option(
- name = "experimental_extra_action_top_level_only_with_aspects",
- defaultValue = "true",
- category = "experimental",
- help =
- "If true and --experimental_extra_action_top_level_only=true, will include actions "
- + "from aspects injected by top-level rules. "
- + "This is an escape hatch in case commit df9e5e16c370391098c4432779ad4d1c9dd693ca "
- + "breaks something."
- )
- public boolean extraActionTopLevelOnlyWithAspects;
-
@Option(
name = "version_window_for_dirty_node_gc",
defaultValue = "0",
@@ -735,9 +723,6 @@ public class BuildView {
target.getProvider(ExtraActionArtifactsProvider.class);
if (provider != null) {
if (viewOptions.extraActionTopLevelOnly) {
- if (!viewOptions.extraActionTopLevelOnlyWithAspects) {
- builder.addTransitive(provider.getExtraActionArtifacts());
- } else {
// Collect all aspect-classes that topLevel might inject.
Set<AspectClass> aspectClasses = new HashSet<>();
for (Attribute attr : target.getTarget().getAssociatedRule().getAttributes()) {
@@ -748,7 +733,6 @@ public class BuildView {
if (!aspectClasses.isEmpty()) {
builder.addAll(filterTransitiveExtraActions(provider, aspectClasses));
}
- }
} else {
builder.addTransitive(provider.getTransitiveExtraActionArtifacts());
}
