Skip to content

Commit 28d2daa

Browse files
fmeumcopybara-github
authored andcommitted
Set --experimental_action_listeners to default in exec config
Previously, the flag value was set to `null` rather than an empty list, which resulted in distinct yet equivalent configurations. Fixes bazelbuild#16911 Closes bazelbuild#16912. PiperOrigin-RevId: 493175302 Change-Id: I7a34c988265f3a3d94f1720a7fc7ad501eb44247
1 parent 88101d0 commit 28d2daa

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.google.common.annotations.VisibleForTesting;
1818
import com.google.common.base.Suppliers;
1919
import com.google.common.collect.ImmutableCollection;
20-
import com.google.common.collect.ImmutableList;
2120
import com.google.common.collect.ImmutableMap;
2221
import com.google.common.collect.ImmutableSet;
2322
import com.google.common.collect.ImmutableSortedMap;
@@ -746,7 +745,7 @@ public int analysisTestingDepsLimit() {
746745
}
747746

748747
public List<Label> getActionListeners() {
749-
return options.actionListeners == null ? ImmutableList.of() : options.actionListeners;
748+
return options.actionListeners;
750749
}
751750

752751
/**

src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private static BuildOptions transitionImpl(BuildOptionsView options, Label execu
129129
coreOptions.isHost = false;
130130
coreOptions.isExec = true;
131131
// Disable extra actions
132-
coreOptions.actionListeners = null;
132+
coreOptions.actionListeners = ImmutableList.of();
133133

134134
// Then set the target to the saved execution platform if there is one.
135135
PlatformOptions platformOptions = execOptions.get(PlatformOptions.class);

0 commit comments

Comments
 (0)