Clean up names and docs of common platform-related attributes.
PiperOrigin-RevId: 375554568
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 31c68f4..612867c 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
@@ -357,7 +357,7 @@
public static RuleClass.Builder execPropertiesAttribute(RuleClass.Builder builder)
throws ConversionException {
return builder.add(
- attr(RuleClass.EXEC_PROPERTIES, STRING_DICT).defaultValue(ImmutableMap.of()));
+ attr(RuleClass.EXEC_PROPERTIES_ATTR, STRING_DICT).defaultValue(ImmutableMap.of()));
}
/**
@@ -384,7 +384,7 @@
// Any rule that has provides its own meaning for the "target_compatible_with" attribute
// has to be excluded in `RuleContextConstraintSemantics.incompatibleConfiguredTarget()`.
.add(
- attr(RuleClass.TARGET_RESTRICTED_TO_ATTR, LABEL_LIST)
+ attr(RuleClass.TARGET_COMPATIBLE_WITH_ATTR, LABEL_LIST)
.mandatoryProviders(ConstraintValueInfo.PROVIDER.id())
// This should be configurable to allow for complex types of restrictions.
.allowedFileTypes(FileTypeSet.NO_FILE))
@@ -442,7 +442,7 @@
attr("data", LABEL_LIST)
.allowedFileTypes(FileTypeSet.ANY_FILE)
.dontCheckConstraints())
- .add(attr(RuleClass.EXEC_PROPERTIES, Type.STRING_DICT).value(ImmutableMap.of()))
+ .add(attr(RuleClass.EXEC_PROPERTIES_ATTR, Type.STRING_DICT).value(ImmutableMap.of()))
.add(
attr(RuleClass.EXEC_COMPATIBLE_WITH_ATTR, BuildType.LABEL_LIST)
.allowedFileTypes()
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 4ddd2fc..879d23f 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
@@ -1812,11 +1812,11 @@
ExecGroupCollection.Builder execGroupCollectionBuilder, AttributeMap attributes)
throws InvalidExecGroupException {
if (rawExecProperties == null) {
- if (!attributes.has(RuleClass.EXEC_PROPERTIES, Type.STRING_DICT)) {
+ if (!attributes.has(RuleClass.EXEC_PROPERTIES_ATTR, Type.STRING_DICT)) {
rawExecProperties = ImmutableMap.of();
} else {
rawExecProperties =
- ImmutableMap.copyOf(attributes.get(RuleClass.EXEC_PROPERTIES, Type.STRING_DICT));
+ ImmutableMap.copyOf(attributes.get(RuleClass.EXEC_PROPERTIES_ATTR, Type.STRING_DICT));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
index 29c4feb..8632c63 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
@@ -143,14 +143,14 @@
.allowedFileTypes(FileTypeSet.NO_FILE)
.mandatoryProviders(ImmutableList.of(TemplateVariableInfo.PROVIDER.id()))
.dontCheckConstraints())
- .add(attr(RuleClass.EXEC_PROPERTIES, Type.STRING_DICT).value(ImmutableMap.of()))
+ .add(attr(RuleClass.EXEC_PROPERTIES_ATTR, Type.STRING_DICT).value(ImmutableMap.of()))
.add(
attr(RuleClass.EXEC_COMPATIBLE_WITH_ATTR, BuildType.LABEL_LIST)
.allowedFileTypes()
.nonconfigurable("Used in toolchain resolution")
.value(ImmutableList.of()))
.add(
- attr(RuleClass.TARGET_RESTRICTED_TO_ATTR, LABEL_LIST)
+ attr(RuleClass.TARGET_COMPATIBLE_WITH_ATTR, LABEL_LIST)
.mandatoryProviders(ConstraintValueInfo.PROVIDER.id())
// This should be configurable to allow for complex types of restrictions.
.allowedFileTypes(FileTypeSet.NO_FILE))
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index 3f7255b..33769dd 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -151,8 +151,6 @@
public static final PathFragment THIRD_PARTY_PREFIX = PathFragment.create("third_party");
public static final PathFragment EXPERIMENTAL_PREFIX = PathFragment.create("experimental");
- public static final String EXEC_COMPATIBLE_WITH_ATTR = "exec_compatible_with";
- public static final String EXEC_PROPERTIES = "exec_properties";
/*
* The attribute that declares the set of license labels which apply to this target.
*/
@@ -339,9 +337,21 @@
/**
* For Bazel's constraint system: the attribute that declares the list of constraints that the
- * target must satisfy to be considered compatible.
+ * target platform must satisfy to be considered compatible.
*/
- public static final String TARGET_RESTRICTED_TO_ATTR = "target_compatible_with";
+ public static final String TARGET_COMPATIBLE_WITH_ATTR = "target_compatible_with";
+
+ /**
+ * For Bazel's constraint system: the attribute that declares the list of constraints that the
+ * execution platform must satisfy to be considered compatible.
+ */
+ public static final String EXEC_COMPATIBLE_WITH_ATTR = "exec_compatible_with";
+
+ /**
+ * The attribute that declares execution properties that should be added to actions created by
+ * this target.
+ */
+ public static final String EXEC_PROPERTIES_ATTR = "exec_properties";
/**
* For Bazel's constraint system: the implicit attribute used to store rule class restriction
@@ -1479,7 +1489,7 @@
this.supportsConstraintChecking = false;
attributes.remove(RuleClass.COMPATIBLE_ENVIRONMENT_ATTR);
attributes.remove(RuleClass.RESTRICTED_ENVIRONMENT_ATTR);
- attributes.remove(RuleClass.TARGET_RESTRICTED_TO_ATTR);
+ attributes.remove(RuleClass.TARGET_COMPATIBLE_WITH_ATTR);
return this;
}
