Skip to content

Commit

Permalink
Set --experimental_action_listeners to default in exec config
Browse files Browse the repository at this point in the history
Previously, the flag value was set to `null` rather than an empty list, which resulted in distinct yet equivalent configurations.

Fixes #16911

Closes #16912.

PiperOrigin-RevId: 493175302
Change-Id: I7a34c988265f3a3d94f1720a7fc7ad501eb44247
  • Loading branch information
fmeum authored and copybara-github committed Dec 6, 2022
1 parent 88101d0 commit 28d2daa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
Expand Down Expand Up @@ -746,7 +745,7 @@ public int analysisTestingDepsLimit() {
}

public List<Label> getActionListeners() {
return options.actionListeners == null ? ImmutableList.of() : options.actionListeners;
return options.actionListeners;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private static BuildOptions transitionImpl(BuildOptionsView options, Label execu
coreOptions.isHost = false;
coreOptions.isExec = true;
// Disable extra actions
coreOptions.actionListeners = null;
coreOptions.actionListeners = ImmutableList.of();

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

0 comments on commit 28d2daa

Please sign in to comment.