Partial rollback of https://github.com/bazelbuild/bazel/commit/c650978632fe24935a8d6b330756e62fe61b916e for features that are no longer needed.

PiperOrigin-RevId: 399205205

src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
index 73b18df..daec343 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
@@ -20,7 +20,6 @@
 import com.google.devtools.build.lib.packages.Aspect;
 import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.skyframe.AspectKeyCreator.AspectKey;
-import com.google.devtools.build.lib.skyframe.BuildConfigurationValue;
 import javax.annotation.Nullable;
 import net.starlark.java.syntax.Location;
 
@@ -94,12 +93,6 @@
   }
 
   @Override
-  @Nullable
-  public BuildConfigurationValue.Key getConfigurationKey() {
-    return key.getAspectConfigurationKey();
-  }
-
-  @Override
   public String toString() {
     return getStringHelper()
         .add("key", key)

src/main/java/com/google/devtools/build/lib/analysis/BUILD

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
index 8cb9aa7..64c684a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -665,9 +665,7 @@
         ":provider_collection",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/packages",
-        "//src/main/java/com/google/devtools/build/lib/skyframe:build_configuration_value",
         "//src/main/java/com/google/devtools/build/skyframe",
-        "//third_party:jsr305",
     ],
 )
 
@@ -700,8 +698,6 @@
     deps = [
         ":configured_object_value",
         ":configured_target",
-        "//src/main/java/com/google/devtools/build/lib/skyframe:build_configuration_value",
-        "//third_party:jsr305",
     ],
 )
 

src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java
index 3a6b8eb..b06000a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java
@@ -15,9 +15,7 @@
 
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.skyframe.BuildConfigurationValue;
 import com.google.devtools.build.skyframe.NotComparableSkyValue;
-import javax.annotation.Nullable;
 
 /**
  * Super-interface for {@link ConfiguredTargetValue} and {@link RuleConfiguredObjectValue}
@@ -28,13 +26,6 @@
   ProviderCollection getConfiguredObject();
 
   /**
-   * Returns a key representing the configuration in which this value was analyzed, or {@code null}
-   * if no configuration was considered.
-   */
-  @Nullable
-  BuildConfigurationValue.Key getConfigurationKey();
-
-  /**
    * Returns the set of packages transitively loaded by this value. Must only be used for
    * constructing the package -> source root map needed for some builds. If the caller has not
    * specified that this map needs to be constructed (via the constructor argument in {@link

src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetValue.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetValue.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetValue.java
index 0cc86c9..63376da 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetValue.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetValue.java
@@ -14,9 +14,6 @@
 
 package com.google.devtools.build.lib.analysis;
 
-import com.google.devtools.build.lib.skyframe.BuildConfigurationValue;
-import javax.annotation.Nullable;
-
 /** A {@link com.google.devtools.build.skyframe.SkyValue} for a {@link ConfiguredTarget}. */
 public interface ConfiguredTargetValue extends ConfiguredObjectValue {
 
@@ -27,10 +24,4 @@
   default ConfiguredTarget getConfiguredObject() {
     return getConfiguredTarget();
   }
-
-  @Override
-  @Nullable
-  default BuildConfigurationValue.Key getConfigurationKey() {
-    return getConfiguredTarget().getConfigurationKey();
-  }
 }