commit 3c7d571d1c57bc26c7a907af0bacde1bd183067f
author Googler <shahan@google.com> Fri Jul 14 06:33:31 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jul 14 06:35:01 2023 -0700
tree db501f43ccd073d9b4779bc01f7c4c7d2591a7b5
parent 8cbb8840f00523148e7a64dc39db8667cd86e21e

Delete ActionLookupKeyOrProxy.

This layer of indirection isn't currently used.

PiperOrigin-RevId: 548110996
Change-Id: I58d381456caff4668588304ba7750c4552eebe3a

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
index 38c9ffa..d7b4b28 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.Interner;
 import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
 import com.google.devtools.build.lib.actions.ActionLookupKey;
-import com.google.devtools.build.lib.actions.ActionLookupKeyOrProxy;
 import com.google.devtools.build.lib.actions.BasicActionLookupValue;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.concurrent.BlazeInterners;
@@ -33,8 +32,7 @@
     super(generatingActions);
   }
 
-  public static ActionTemplateExpansionKey key(
-      ActionLookupKeyOrProxy actionLookupKey, int actionIndex) {
+  public static ActionTemplateExpansionKey key(ActionLookupKey actionLookupKey, int actionIndex) {
     return ActionTemplateExpansionKey.of(actionLookupKey, actionIndex);
   }
 
@@ -44,18 +42,17 @@
     private static final Interner<ActionTemplateExpansionKey> interner =
         BlazeInterners.newWeakInterner();
 
-    private final ActionLookupKeyOrProxy actionLookupKey;
+    private final ActionLookupKey actionLookupKey;
     private final int actionIndex;
 
-    private ActionTemplateExpansionKey(ActionLookupKeyOrProxy actionLookupKey, int actionIndex) {
+    private ActionTemplateExpansionKey(ActionLookupKey actionLookupKey, int actionIndex) {
       this.actionLookupKey = actionLookupKey;
       this.actionIndex = actionIndex;
     }
 
     @VisibleForTesting
     @AutoCodec.Instantiator
-    public static ActionTemplateExpansionKey of(
-        ActionLookupKeyOrProxy actionLookupKey, int actionIndex) {
+    public static ActionTemplateExpansionKey of(ActionLookupKey actionLookupKey, int actionIndex) {
       return interner.intern(new ActionTemplateExpansionKey(actionLookupKey, actionIndex));
     }
 
@@ -74,7 +71,7 @@
       return actionLookupKey.getConfigurationKey();
     }
 
-    public ActionLookupKeyOrProxy getActionLookupKey() {
+    public ActionLookupKey getActionLookupKey() {
       return actionLookupKey;
     }