diff options
| author | Ivan Gavrilovic <gavra@google.com> | 2018-05-08 02:26:09 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-08 02:26:09 -0700 |
| commit | 2b50d295f5acc8ddf8924cd6536dfbfe45965ade (patch) | |
| tree | 74deac1e16e97c2c13f226cd4635cd65abf19303 /java/com/google/devtools/common/options/OptionFilterDescriptions.java | |
| parent | 301a69dfe6fbb59072b6c1af278ec31c10cbdf35 (diff) | |
| parent | 6beb00b4744298d2ef28b6590c31b6848885b28d (diff) | |
| download | desugar-2b50d295f5acc8ddf8924cd6536dfbfe45965ade.tar.gz | |
Merge remote-tracking branch upstream-master into master am: 9d2aa11004android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3
am: 6beb00b474
Change-Id: I5f801929d952fac02c0b652fb9003295f4bf7820
Diffstat (limited to 'java/com/google/devtools/common/options/OptionFilterDescriptions.java')
| -rw-r--r-- | java/com/google/devtools/common/options/OptionFilterDescriptions.java | 3 |
1 files changed, 3 insertions, 0 deletions
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( |