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

1 files changed, 4 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationFunction.java
index 093cbb015a..9edebb8735 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationFunction.java
@@ -18,6 +18,7 @@ import static com.google.devtools.build.lib.analysis.config.BuildConfiguration.F
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.MutableClassToInstanceMap;
+import com.google.devtools.build.lib.actions.ActionEnvironment;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -77,6 +78,8 @@ public class BuildConfigurationFunction implements SkyFunction {
     }
 
     BuildOptions options = defaultBuildOptions.applyDiff(key.getOptionsDiff());
+    ActionEnvironment actionEnvironment =
+      ruleClassProvider.getActionEnvironmentProvider().getActionEnvironment(options);
 
     BuildConfiguration config =
         new BuildConfiguration(
@@ -85,6 +88,7 @@ public class BuildConfigurationFunction implements SkyFunction {
             options,
             key.getOptionsDiff(),
             ruleClassProvider.getReservedActionMnemonics(),
+            actionEnvironment,
             workspaceNameValue.getName());
     return new BuildConfigurationValue(config);
   }