Remove BuildConfiguration.Fragment#setupActionEnvironment().

This is accomplished by moving it to ConfiguredRuleClassProvider. This also suggests a neat way to get rid of logic in ShellConfiguration.Loader() by moving the determination of the shell executable, there, too, but not in this change.

RELNOTES: None.
PiperOrigin-RevId: 192411609

3 files changed, 13 insertions, 13 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index eb082244a6..27e33dbd5f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -285,7 +285,6 @@ public final class BazelAnalysisMock extends AnalysisMock {
         new CppConfigurationLoader(CpuTransformer.IDENTITY),
         new ShellConfiguration.Loader(
             BazelRuleClassProvider.SHELL_EXECUTABLE,
-            BazelRuleClassProvider.SHELL_ACTION_ENV,
             ShellConfiguration.Options.class,
             StrictActionEnvOptions.class),
         new PythonConfigurationLoader(),
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProviderTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProviderTest.java
index 1c1fe3a7af..d18897217c 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProviderTest.java
@@ -16,10 +16,10 @@ package com.google.devtools.build.lib.bazel.rules;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider.SHELL_ACTION_ENV;
 import static com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider.pathOrDefault;
 
 import com.google.common.collect.ImmutableList;
+import com.google.devtools.build.lib.actions.ActionEnvironment;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.analysis.ShellConfiguration;
@@ -36,10 +36,8 @@ import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules;
 import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.common.options.Options;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -172,15 +170,16 @@ public class BazelRuleClassProviderTest {
     }
 
     BuildOptions options = BuildOptions.of(
-        ImmutableList.of(StrictActionEnvOptions.class),
-        "--experimental_strict_action_env");
-
-    ShellConfiguration configuration = new ShellConfiguration(
-        PathFragment.create("/bin/bash"),
-        SHELL_ACTION_ENV.fromOptions(options));
-    Map<String, String> env = new HashMap<>();
-    configuration.setupActionEnvironment(env);
-    assertThat(env).containsEntry("PATH", "/bin:/usr/bin");
+        ImmutableList.of(
+            BuildConfiguration.Options.class,
+            ShellConfiguration.Options.class,
+            StrictActionEnvOptions.class),
+        "--experimental_strict_action_env",
+        "--action_env=FOO=bar");
+
+    ActionEnvironment env = BazelRuleClassProvider.SHELL_ACTION_ENV.getActionEnvironment(options);
+    assertThat(env.getFixedEnv()).containsEntry("PATH", "/bin:/usr/bin");
+    assertThat(env.getFixedEnv()).containsEntry("FOO", "bar");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
index fa342ec987..3d52a3d216 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
@@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.devtools.build.lib.actions.ActionEnvironment;
 import com.google.devtools.build.lib.actions.ActionExecutedEvent;
 import com.google.devtools.build.lib.actions.ActionExecutedEvent.ErrorTiming;
 import com.google.devtools.build.lib.actions.ActionExecutionException;
@@ -651,6 +652,7 @@ public class BuildEventStreamerTest extends FoundationTestCase {
             defaultBuildOptions,
             BuildOptions.diffForReconstruction(defaultBuildOptions, defaultBuildOptions),
             /* reservedActionMnemonics= */ ImmutableSet.of(),
+            ActionEnvironment.EMPTY,
             "workspace");
     BuildEvent firstWithConfiguration =
         new GenericConfigurationEvent(testId("first"), configuration.toBuildEvent());