From 33aa306d3420ba406acdf998208f438e88bebe4b Mon Sep 17 00:00:00 2001 From: Carmi Grushko Date: Fri, 11 Nov 2016 02:45:29 +0000 Subject: Expose aspect-related information in the extra-action proto that Bazel hands to action_listener() rules. RELNOTES: Extra actions now contain aspect-related information. -- MOS_MIGRATED_REVID=138832922 --- .../com/google/devtools/build/lib/actions/ActionOwner.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java') diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java index a7a4aa7bb3..b641a4d31a 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java @@ -17,6 +17,7 @@ import com.google.auto.value.AutoValue; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Location; +import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.util.Preconditions; import javax.annotation.Nullable; @@ -32,10 +33,12 @@ import javax.annotation.Nullable; public abstract class ActionOwner { /** An action owner for special cases. Usage is strongly discouraged. */ public static final ActionOwner SYSTEM_ACTION_OWNER = - ActionOwner.create(null, null, "system", "empty target kind", "system", null); + ActionOwner.create(null, null, null, null, "system", "empty target kind", "system", null); public static ActionOwner create( @Nullable Label label, + @Nullable String aspectName, + @Nullable AspectParameters aspectParameters, @Nullable Location location, @Nullable String mnemonic, @Nullable String targetKind, @@ -44,6 +47,8 @@ public abstract class ActionOwner { return new AutoValue_ActionOwner( location, label, + aspectName, + aspectParameters, mnemonic, Preconditions.checkNotNull(configurationChecksum), targetKind, @@ -58,6 +63,12 @@ public abstract class ActionOwner { @Nullable public abstract Label getLabel(); + @Nullable + public abstract String getAspectName(); + + @Nullable + public abstract AspectParameters getAspectParameters(); + /** Returns the configuration's mnemonic. */ @Nullable public abstract String getConfigurationMnemonic(); -- cgit v1.2.3