Add platform_common.MakeVariableInfo so that Skylark code has access to the Make variables provider.

RELNOTES: None.
PiperOrigin-RevId: 173527191

3 files changed, 17 insertions, 17 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index 8a8e815ad2..3935ee1d1a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -310,7 +310,7 @@ public class BaseRuleClasses {
           <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
           .add(attr("toolchains", LABEL_LIST)
               .allowedFileTypes(FileTypeSet.NO_FILE)
-              .mandatoryProviders(ImmutableList.of(MakeVariableInfo.PROVIDER.id())))
+              .mandatoryProviders(ImmutableList.of(TemplateVariableInfo.PROVIDER.id())))
           .build();
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 94423b6482..312cccca14 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -963,20 +963,20 @@ public final class RuleContext extends TargetContext
   }
 
   public ImmutableMap<String, String> getMakeVariables(Iterable<String> attributeNames) {
-    ArrayList<MakeVariableInfo> makeVariableInfos = new ArrayList<>();
+    ArrayList<TemplateVariableInfo> templateVariableInfos = new ArrayList<>();
 
     for (String attributeName : attributeNames) {
       // TODO(b/37567440): Remove this continue statement.
       if (!attributes().has(attributeName)) {
         continue;
       }
-      Iterables.addAll(makeVariableInfos, getPrerequisites(
-          attributeName, Mode.DONT_CHECK, MakeVariableInfo.PROVIDER));
+      Iterables.addAll(templateVariableInfos, getPrerequisites(
+          attributeName, Mode.DONT_CHECK, TemplateVariableInfo.PROVIDER));
     }
 
     LinkedHashMap<String, String> makeVariables = new LinkedHashMap<>();
-    for (MakeVariableInfo makeVariableInfo : makeVariableInfos) {
-      makeVariables.putAll(makeVariableInfo.getMakeVariables());
+    for (TemplateVariableInfo templateVariableInfo : templateVariableInfos) {
+      makeVariables.putAll(templateVariableInfo.getVariables());
     }
 
     return ImmutableMap.copyOf(makeVariables);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/MakeVariableInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/TemplateVariableInfo.java
index d4bb747067..77cdf94d27 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/MakeVariableInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TemplateVariableInfo.java
@@ -22,28 +22,28 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 
 /** Provides access to make variables from the current fragments. */
-@SkylarkModule(name = "MakeVariables", doc = "Make variables exposed by the current target.")
+@SkylarkModule(name = "TemplateVariables", doc = "Make variables exposed by the current target.")
 @Immutable
-public final class MakeVariableInfo extends NativeInfo {
-  public static final String SKYLARK_NAME = "MakeVariableInfo";
+public final class TemplateVariableInfo extends NativeInfo {
+  public static final String SKYLARK_NAME = "TemplateVariableInfo";
 
-  public static final NativeProvider<MakeVariableInfo> PROVIDER =
-      new NativeProvider<MakeVariableInfo>(MakeVariableInfo.class, SKYLARK_NAME) {};
+  public static final NativeProvider<TemplateVariableInfo> PROVIDER =
+      new NativeProvider<TemplateVariableInfo>(TemplateVariableInfo.class, SKYLARK_NAME) {};
 
-  private final ImmutableMap<String, String> makeVariables;
+  private final ImmutableMap<String, String> variables;
 
-  public MakeVariableInfo(ImmutableMap<String, String> makeVariables) {
+  public TemplateVariableInfo(ImmutableMap<String, String> variables) {
     super(PROVIDER);
-    this.makeVariables = makeVariables;
+    this.variables = variables;
   }
 
   @SkylarkCallable(
-    name = "make_variables",
+    name = "variables",
     doc = "Returns the make variables defined by this target.",
     structField = true
   )
-  public ImmutableMap<String, String> getMakeVariables() {
-    return makeVariables;
+  public ImmutableMap<String, String> getVariables() {
+    return variables;
   }
 
   @Override