commit 86409b7a248d1cb966268451f9aa4db0763c3eb2
author jhorvitz <jhorvitz@google.com> Mon Oct 04 16:55:20 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Oct 04 16:56:43 2021 -0700
tree 21d7005865729aa5a234f68f8d350ea56ca1b332
parent 09e3c53d3987532e29e01f242152caa4039270f7

Remove code related to trimming the host configuration.

The `FragmentClassSet` passed to `BuildConfiguration#clone` is always the full set of fragments, so no trimming is ever performed.

PiperOrigin-RevId: 400847795

src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index fbe50ab..2633d47 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -158,8 +158,7 @@
       Object starlarkValue = bzlLoadValue.getModule().getGlobal(starlarkValueName);
       if (starlarkValue == null) {
         throw new ConversionException(
-            String.format(
-                "%s is not exported from %s", starlarkValueName, extensionLabel.toString()));
+            String.format("%s is not exported from %s", starlarkValueName, extensionLabel));
       }
       if (!(starlarkValue instanceof StarlarkDefinedAspect)) {
         throw new ConversionException(
@@ -296,7 +295,7 @@
     if (AliasProvider.isAlias(associatedTarget)) {
       return createAliasAspect(
           env,
-          view.getHostConfiguration(aspectConfiguration),
+          view.getHostConfiguration(),
           new TargetAndConfiguration(target, configuration),
           aspect,
           key,
@@ -427,7 +426,7 @@
                         .build(),
                 shouldUseToolchainTransition(configuration, aspect.getDefinition()),
                 ruleClassProvider,
-                view.getHostConfiguration(originalTargetAndAspectConfiguration.getConfiguration()),
+                view.getHostConfiguration(),
                 transitivePackagesForPackageRootResolution,
                 transitiveRootCauses);
       } catch (ConfiguredValueCreationException e) {
@@ -729,7 +728,7 @@
         transitivePackagesForPackageRootResolution);
   }
 
-  private AspectValue createAliasAspect(
+  private static AspectValue createAliasAspect(
       Environment env,
       Target originalTarget,
       AspectKey originalKey,
@@ -875,7 +874,7 @@
                     configConditions,
                     toolchainContext,
                     aspectConfiguration,
-                    view.getHostConfiguration(aspectConfiguration),
+                    view.getHostConfiguration(),
                     key);
       } catch (MissingDepException e) {
         Preconditions.checkState(env.valuesMissing());