From 860612cdb446fdea13b59a5320e5de7a4a429039 Mon Sep 17 00:00:00 2001
From: Googler <jcater@google.com>
Date: Fri, 6 Oct 2023 09:49:43 -0700
Subject: [PATCH] Inline and remove BuildConfigurationKey.withPlatformMapping.

Next will be to rename `withoutPlatformMapping`.

Work towards platform-based flags: #19409.

PiperOrigin-RevId: 571363118
Change-Id: I170d83c8cc6550f33abeaa6b11cb58447104b134
---
 .../BuildConfigurationKeyProducer.java          |  6 +++---
 .../build/lib/skyframe/SkyframeExecutor.java    |  3 ++-
 .../skyframe/config/BuildConfigurationKey.java  | 17 -----------------
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/producers/BuildConfigurationKeyProducer.java b/src/main/java/com/google/devtools/build/lib/analysis/producers/BuildConfigurationKeyProducer.java
index 1ca5df73bb18e3..8b9d1b95bcd89d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/producers/BuildConfigurationKeyProducer.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/producers/BuildConfigurationKeyProducer.java
@@ -89,9 +89,9 @@ private StateMachine applyMappings(Tasks tasks) {
       String transitionKey = entry.getKey();
       BuildConfigurationKey newConfigurationKey;
       try {
-        newConfigurationKey =
-            BuildConfigurationKey.withPlatformMapping(
-                platformMappingValues.get(transitionKey), entry.getValue());
+        PlatformMappingValue mappingValue = platformMappingValues.get(transitionKey);
+        BuildOptions mappedOptions = mappingValue.map(entry.getValue());
+        newConfigurationKey = BuildConfigurationKey.withoutPlatformMapping(mappedOptions);
       } catch (OptionsParsingException e) {
         sink.acceptTransitionError(e);
         return runAfter;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index dd8ab6a4b8e144..6cf769449501c7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -1807,7 +1807,8 @@ private BuildConfigurationKey createBuildConfigurationKey(
 
     // Create the build configuration key.
     try {
-      return BuildConfigurationKey.withPlatformMapping(platformMappingValue, buildOptions);
+      BuildOptions mappedOptions = platformMappingValue.map(buildOptions);
+      return BuildConfigurationKey.withoutPlatformMapping(mappedOptions);
     } catch (OptionsParsingException e) {
       throw new InvalidConfigurationException(Code.INVALID_BUILD_OPTIONS, e);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/config/BuildConfigurationKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/config/BuildConfigurationKey.java
index 050f79a5bca8eb..64e296839a5b5f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/config/BuildConfigurationKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/config/BuildConfigurationKey.java
@@ -20,7 +20,6 @@
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
-import com.google.devtools.common.options.OptionsParsingException;
 
 /**
  * {@link SkyKey} for {@link com.google.devtools.build.lib.analysis.config.BuildConfigurationValue}.
@@ -30,22 +29,6 @@ public final class BuildConfigurationKey implements SkyKey {
 
   private static final SkyKeyInterner<BuildConfigurationKey> interner = SkyKey.newInterner();
 
-  /**
-   * Creates a new configuration key based on the given options, after applying a platform mapping
-   * transformation.
-   *
-   * @param platformMappingValue sky value that can transform a configuration key based on a
-   *     platform mapping
-   * @param options the desired configuration
-   * @throws OptionsParsingException if the platform mapping cannot be parsed
-   */
-  public static BuildConfigurationKey withPlatformMapping(
-      PlatformMappingValue platformMappingValue, BuildOptions options)
-      throws OptionsParsingException {
-    BuildOptions mappedOptions = platformMappingValue.map(options);
-    return BuildConfigurationKey.withoutPlatformMapping(mappedOptions);
-  }
-
   /**
    * Returns the key for a requested configuration.
    *