diff options
| author |  mstaib <mstaib@google.com> | 2017-08-31 23:56:40 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-09-01 12:28:32 +0200 |
| commit | a117235b926eb477299436328a34ad4b1ea0eec0 (patch) | |
| tree | 570d6fac2b13d4262251752fce7cbd448f974ee5 /src/main/java | |
| parent | 494151d0cde6c43284cde26d3447da281f4a0b8f (diff) | |
Release config_setting.flag_values from the whitelist.
This feature is opening up beyond just ConfigFeatureFlags, and so should not
be restricted.
RELNOTES: None.
PiperOrigin-RevId: 167195959
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/config/ConfigRuleClasses.java | 1 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRuleClasses.java index 569b022f10..1071800dff 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRuleClasses.java @@ -201,7 +201,6 @@ public class ConfigRuleClasses { .mandatoryProviders( ImmutableList.of(ConfigFeatureFlagProvider.id())) .nonconfigurable(NONCONFIGURABLE_ATTRIBUTE_REASON)) - .add(ConfigFeatureFlag.getWhitelistAttribute(env)) .setIsConfigMatcherForConfigSettingOnly() .setOptionReferenceFunctionForConfigSettingOnly( rule -> diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java index 97c5b6beb2..bcfd484e80 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java @@ -87,16 +87,6 @@ public class ConfigSetting implements RuleConfiguredTargetFactory { ConfigSettingRule.FLAG_SETTINGS_ATTRIBUTE, BuildType.LABEL_KEYED_STRING_DICT); - if (!userDefinedFlagSettings.isEmpty() && !ConfigFeatureFlag.isAvailable(ruleContext)) { - ruleContext.attributeError( - ConfigSettingRule.FLAG_SETTINGS_ATTRIBUTE, - String.format( - "the %s attribute is not available in package '%s'", - ConfigSettingRule.FLAG_SETTINGS_ATTRIBUTE, - ruleContext.getLabel().getPackageIdentifier())); - throw new RuleErrorException(); - } - List<? extends TransitiveInfoCollection> flagValues = ruleContext.getPrerequisites( ConfigSettingRule.FLAG_SETTINGS_ATTRIBUTE, Mode.TARGET); |