From 9137a75238bcfa0716836fee2295cece41d451b3 Mon Sep 17 00:00:00 2001 From: lberki Date: Fri, 9 Jun 2017 12:49:10 +0200 Subject: 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. PiperOrigin-RevId: 158502426 --- .../devtools/build/lib/analysis/BuildView.java | 32 ++++++---------------- 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/BuildView.java') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index 382ba82dee..ba5b06c19a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -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,19 +723,15 @@ 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 aspectClasses = new HashSet<>(); - for (Attribute attr : target.getTarget().getAssociatedRule().getAttributes()) { - aspectClasses.addAll(attr.getAspectClasses()); - } + // Collect all aspect-classes that topLevel might inject. + Set aspectClasses = new HashSet<>(); + for (Attribute attr : target.getTarget().getAssociatedRule().getAttributes()) { + aspectClasses.addAll(attr.getAspectClasses()); + } - builder.addTransitive(provider.getExtraActionArtifacts()); - if (!aspectClasses.isEmpty()) { - builder.addAll(filterTransitiveExtraActions(provider, aspectClasses)); - } + builder.addTransitive(provider.getExtraActionArtifacts()); + if (!aspectClasses.isEmpty()) { + builder.addAll(filterTransitiveExtraActions(provider, aspectClasses)); } } else { builder.addTransitive(provider.getTransitiveExtraActionArtifacts()); -- cgit v1.2.3