commit 9137a75238bcfa0716836fee2295cece41d451b3
author lberki <lberki@google.com> Fri Jun 09 12:49:10 2017 +0200
committer Jakob Buchgraber <buchgr@google.com> Fri Jun 09 13:32:00 2017 +0200
tree f7b9cad4580147c897615661ba5a8cf9e279d389
parent 9a958522aaa2cc0374425fbf1a9a120a3c458a2a

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

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 382ba82..ba5b06c 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
@@ -223,18 +223,6 @@
     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",
       optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED,
@@ -735,19 +723,15 @@
           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()) {
-              aspectClasses.addAll(attr.getAspectClasses());
-            }
+          // Collect all aspect-classes that topLevel might inject.
+          Set<AspectClass> 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());