Introduce CppCompileActionTemplate, which expands into a list of CppCompileActions that to be executed at execution time.

--
PiperOrigin-RevId: 147163077
MOS_MIGRATED_REVID=147163077

1 files changed, 7 insertions, 7 deletions

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 fa429028b7..0ac6e600fe 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
@@ -16,7 +16,7 @@ package com.google.devtools.build.lib.skyframe;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Action;
 import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
-import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate;
+import com.google.devtools.build.lib.analysis.actions.ActionTemplate;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.skyframe.ActionLookupValue.ActionLookupKey;
 import com.google.devtools.build.lib.util.Preconditions;
@@ -38,22 +38,22 @@ public final class ActionTemplateExpansionValue extends ActionLookupValue {
     return expandedActions;
   }
 
-  static SkyKey key(SpawnActionTemplate actionTemplate) {
+  static SkyKey key(ActionTemplate<?> actionTemplate) {
     return SkyKey.create(
         SkyFunctions.ACTION_TEMPLATE_EXPANSION,
         createActionTemplateExpansionKey(actionTemplate));
   }
 
   static ActionTemplateExpansionKey createActionTemplateExpansionKey(
-      SpawnActionTemplate actionTemplate) {
+      ActionTemplate<?> actionTemplate) {
     return new ActionTemplateExpansionKey(actionTemplate);
   }
 
 
   static final class ActionTemplateExpansionKey extends ActionLookupKey {
-    private final SpawnActionTemplate actionTemplate;
+    private final ActionTemplate<?> actionTemplate;
 
-    ActionTemplateExpansionKey(SpawnActionTemplate actionTemplate) {
+    ActionTemplateExpansionKey(ActionTemplate<?> actionTemplate) {
       Preconditions.checkNotNull(
           actionTemplate,
           "Passed in action template cannot be null: %s",
@@ -72,8 +72,8 @@ public final class ActionTemplateExpansionValue extends ActionLookupValue {
       return actionTemplate.getOwner().getLabel();
     }
 
-    /** Returns the associated {@link SpawnActionTemplate} */
-    SpawnActionTemplate getActionTemplate() {
+    /** Returns the associated {@link ActionTemplate} */
+    ActionTemplate<?> getActionTemplate() {
       return actionTemplate;
     }