diff options
author | 2017-07-11 14:23:46 +0200 | |
---|---|---|
committer | 2017-07-11 14:47:53 +0200 | |
commit | 456adb2267343a4e2e64f082e77169c18f9e6060 (patch) | |
tree | b63794930df06ad9afc910ca16784cf4bab812f9 /src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java | |
parent | 75483b58d047c3a4e26e098823dc3b77644c3c11 (diff) |
Fold OptionUsageRestrictions into OptionDocumentationCategory and OptionMetadataTags.
These are similar, no need to have both fields. Removing the "DOCUMENTED" default, the absence of UNDOCUMENTED will be used instead.
Since requiring a documentation category for undocumented options doesn't make sense, list that as one of the OptionDocumentationCategories, but list HIDDEN and INTERNAL as part of OptionMetadata. These options should list UNDOCUMENTED as their category.
PiperOrigin-RevId: 161515674
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java index a705b3ef8d..0b96a68d6d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java @@ -34,9 +34,9 @@ import com.google.devtools.common.options.Converter; import com.google.devtools.common.options.EnumConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; -import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions; import com.google.devtools.common.options.OptionsParsingException; import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; +import com.google.devtools.common.options.proto.OptionFilters.OptionMetadataTag; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -585,9 +585,9 @@ public class CppOptions extends FragmentOptions { @Option( name = "lipo configuration state", defaultValue = "apply_lipo", - optionUsageRestrictions = OptionUsageRestrictions.INTERNAL, - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, + metadataTags = {OptionMetadataTag.INTERNAL}, converter = LipoConfigurationStateConverter.class ) public LipoConfigurationState lipoConfigurationState; |