Rollback of commit ca1b21ac6d8a58041db822725b42de151b163dee.

*** Reason for rollback ***

Broke some alipo builds. I had to leave in the change to TransitiveTargetFunctionTest, which is relied upon by follow-up CLs.

*** Original change description ***

Pre-trim build options for all remaining calls to ConfigurationFragment.key. Move
the trimming logic into key() itself to:

 a) eliminate code redundancy
 b) guarantee all future calls to key() also do this.

--
MOS_MIGRATED_REVID=109683849

1 files changed, 2 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
index 7e2a6be2f7..95ff677240 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
@@ -24,7 +24,6 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
 import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.RuleClassProvider;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor.SkyframePackageLoader;
 import com.google.devtools.build.lib.vfs.RootedPath;
@@ -41,12 +40,9 @@ import java.io.IOException;
  */
 class SkyframePackageLoaderWithValueEnvironment implements PackageProviderForConfigurations {
   private final SkyFunction.Environment env;
-  private final RuleClassProvider ruleClassProvider;
 
-  public SkyframePackageLoaderWithValueEnvironment(SkyFunction.Environment env,
-      RuleClassProvider ruleClassProvider) {
+  public SkyframePackageLoaderWithValueEnvironment(SkyFunction.Environment env) {
     this.env = env;
-    this.ruleClassProvider = ruleClassProvider;
   }
 
   private Package getPackage(final PackageIdentifier pkgIdentifier)
@@ -81,7 +77,7 @@ class SkyframePackageLoaderWithValueEnvironment implements PackageProviderForCon
   public <T extends Fragment> T getFragment(BuildOptions buildOptions, Class<T> fragmentType)
       throws InvalidConfigurationException {
     ConfigurationFragmentValue fragmentNode = (ConfigurationFragmentValue) env.getValueOrThrow(
-        ConfigurationFragmentValue.key(buildOptions, fragmentType, ruleClassProvider),
+        ConfigurationFragmentValue.key(buildOptions, fragmentType),
         InvalidConfigurationException.class);
     if (fragmentNode == null) {
       return null;