summaryrefslogtreecommitdiff
path: root/java/com/google/devtools/common
diff options
context:
space:
mode:
Diffstat (limited to 'java/com/google/devtools/common')
-rw-r--r--java/com/google/devtools/common/options/OptionDefinition.java2
-rw-r--r--java/com/google/devtools/common/options/OptionFilterDescriptions.java3
-rw-r--r--java/com/google/devtools/common/options/OptionMetadataTag.java12
3 files changed, 15 insertions, 2 deletions
diff --git a/java/com/google/devtools/common/options/OptionDefinition.java b/java/com/google/devtools/common/options/OptionDefinition.java
index 7b87744..e89234b 100644
--- a/java/com/google/devtools/common/options/OptionDefinition.java
+++ b/java/com/google/devtools/common/options/OptionDefinition.java
@@ -137,7 +137,7 @@ public class OptionDefinition implements Comparable<OptionDefinition> {
}
/** {@link Option#expansionFunction()} ()} */
- Class<? extends ExpansionFunction> getExpansionFunction() {
+ public Class<? extends ExpansionFunction> getExpansionFunction() {
return optionAnnotation.expansionFunction();
}
diff --git a/java/com/google/devtools/common/options/OptionFilterDescriptions.java b/java/com/google/devtools/common/options/OptionFilterDescriptions.java
index 2a7999d..4b4373a 100644
--- a/java/com/google/devtools/common/options/OptionFilterDescriptions.java
+++ b/java/com/google/devtools/common/options/OptionFilterDescriptions.java
@@ -170,6 +170,9 @@ public class OptionFilterDescriptions {
"This option is deprecated. It might be that the feature it affects is deprecated, "
+ "or that another method of supplying the information is preferred.")
.put(
+ OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES,
+ "This option is triggered by the expansion option --all_incompatible_changes.")
+ .put(
OptionMetadataTag.HIDDEN, // Here for completeness, these options are UNDOCUMENTED.
"This option should not be used by a user, and should not be logged.")
.put(
diff --git a/java/com/google/devtools/common/options/OptionMetadataTag.java b/java/com/google/devtools/common/options/OptionMetadataTag.java
index c511fa6..563aa3e 100644
--- a/java/com/google/devtools/common/options/OptionMetadataTag.java
+++ b/java/com/google/devtools/common/options/OptionMetadataTag.java
@@ -55,7 +55,17 @@ public enum OptionMetadataTag {
*
* <p>These should be in category {@code OptionDocumentationCategory.UNDOCUMENTED}.
*/
- INTERNAL(4);
+ INTERNAL(4),
+
+ /**
+ * Options that are triggered by --all_incompatible_changes.
+ *
+ * <p>These must also be labelled {@link OptionMetadataTag#INCOMPATIBLE_CHANGE} and have the
+ * prefix --incompatible_. Note that the option name prefix is also a triggering case for the
+ * --all_incompatible_changes expansion, and so all options that start with the "incompatible_"
+ * prefix must have this tag.
+ */
+ TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES(5);
private final int value;