2 files changed, 11 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
index 3196d70530..70dac58587 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
@@ -393,6 +393,11 @@ public abstract class AbstractAction implements Action, SkylarkValue {
   }
 
   @Override
+  public boolean extraActionCanAttach() {
+    return true;
+  }
+
+  @Override
   public ExtraActionInfo.Builder getExtraActionInfo() {
     return ExtraActionInfo.newBuilder()
         .setOwner(getOwner().getLabel().toString())
diff --git a/src/main/java/com/google/devtools/build/lib/actions/Action.java b/src/main/java/com/google/devtools/build/lib/actions/Action.java
index 9f8953b166..e93b37aab1 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/Action.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/Action.java
@@ -158,6 +158,12 @@ public interface Action extends ActionMetadata, Describable {
   boolean showsOutputUnconditionally();
 
   /**
+   * Returns true if an {@link com.google.devtools.build.lib.rules.extra.ExtraAction} action can be
+   * attached to this action. If not, extra actions should not be attached to this action.
+   */
+  boolean extraActionCanAttach();
+
+  /**
    * Called by {@link com.google.devtools.build.lib.rules.extra.ExtraAction} at execution time to
    * extract information from this action into a protocol buffer to be used by extra_action rules.
    *