diff options
| author |  plf <plf@google.com> | 2017-07-12 12:58:35 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-07-12 16:03:00 +0200 |
| commit | ad7f531e99706be8ba42ea448bf300be450f15b0 (patch) | |
| tree | 93ca2215eb8dc6b9bdd896aa0a6a36e42de8b6b4 /src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java | |
| parent | 77e49975862130fd1905239d86cc8da8031f8f02 (diff) | |
Moves printing method for feature accessibility errors.
The method is moved to FeaturePolicyConfiguration.java so that it can be used
by unrelated parts of the code using feature policies for whitelisting.
RELNOTES:none
PiperOrigin-RevId: 161648169
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java index 87ce548a4a..43928c1f50 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java @@ -29,6 +29,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.RunfilesProvider; +import com.google.devtools.build.lib.analysis.featurecontrol.FeaturePolicyConfiguration; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; @@ -39,12 +40,14 @@ import java.util.List; * The implementation of the config_feature_flag rule for defining custom flags for Android rules. */ public class ConfigFeatureFlag implements RuleConfiguredTargetFactory { + /** The name of the policy that is used to restrict access to the config_feature_flag rule. */ + public static final String POLICY_NAME = "config_feature_flag"; @Override public ConfiguredTarget create(RuleContext ruleContext) throws InterruptedException, RuleErrorException { - ConfigFeatureFlagFeatureVisibility.checkAvailable( - ruleContext, "the " + ruleContext.getRuleClassNameForLogging() + " rule"); + FeaturePolicyConfiguration.checkAvailable( + ruleContext, POLICY_NAME, "the " + ruleContext.getRuleClassNameForLogging() + " rule"); List<String> specifiedValues = ruleContext.attributes().get("allowed_values", STRING_LIST); ImmutableSet<String> values = ImmutableSet.copyOf(specifiedValues); |