diff options
author | 2017-07-13 13:22:44 +0200 | |
---|---|---|
committer | 2017-07-14 10:49:59 +0200 | |
commit | ce1c36d5e1865cb033c7da338b3fbe643e145e55 (patch) | |
tree | 15a4856bf023542ffba0300d79547edaf489dda2 /src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java | |
parent | 34bf0c6e3a7f07679ff29f983c348e2e88a96591 (diff) |
BEP: Report configuration for all actions
Whenever we report an action in the build event protocol that has
a configuration associated with it, report the configuration as
well in the protocol (and not only the checksum, if the configuration
is not that of one of the top-level configured targets).
Change-Id: I9b085d5381b3c3509b4f3b99c8a77bc8fba6abfe
PiperOrigin-RevId: 161789745
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java | 21 |
1 files changed, 19 insertions, 2 deletions
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 72ca914811..b8c0dc883f 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 @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.actions; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; +import com.google.devtools.build.lib.buildeventstream.BuildEvent; 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; @@ -34,8 +35,15 @@ 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, ImmutableList.<AspectDescriptor>of(), - null, "system", "empty target kind", "system", null); + ActionOwner.create( + null, + ImmutableList.<AspectDescriptor>of(), + null, + "system", + "empty target kind", + "system", + null, + null); public static ActionOwner create( @Nullable Label label, @@ -44,6 +52,7 @@ public abstract class ActionOwner { @Nullable String mnemonic, @Nullable String targetKind, String configurationChecksum, + @Nullable BuildEvent configuration, @Nullable String additionalProgressInfo) { return new AutoValue_ActionOwner( location, @@ -51,6 +60,7 @@ public abstract class ActionOwner { aspectDescriptors, mnemonic, Preconditions.checkNotNull(configurationChecksum), + configuration, targetKind, additionalProgressInfo); } @@ -77,6 +87,13 @@ public abstract class ActionOwner { */ public abstract String getConfigurationChecksum(); + /** + * Return the configuration of the action owner, if any, as it should be reported in the build + * event protocol. + */ + @Nullable + public abstract BuildEvent getConfiguration(); + /** Returns the target kind (rule class name) for this ActionOwner, if any; null otherwise. */ @Nullable public abstract String getTargetKind(); |