diff options
Diffstat (limited to 'src/tools/android/java/com')
3 files changed, 9 insertions, 15 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java index e5aab8384c..9f12f12854 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java @@ -34,7 +34,6 @@ import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; -import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions; import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import com.google.errorprone.annotations.MustBeClosed; import java.io.IOError; @@ -113,20 +112,18 @@ class Desugar { @Option( name = "allow_empty_bootclasspath", defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, + effectTags = {OptionEffectTag.UNKNOWN} ) public boolean allowEmptyBootclasspath; @Option( name = "only_desugar_javac9_for_lint", defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, help = - "A temporary flag specifically for android lint, subject to removal anytime (DO NOT USE)", - optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED + "A temporary flag specifically for android lint, subject to removal anytime (DO NOT USE)" ) public boolean onlyDesugarJavac9ForLint; @@ -226,9 +223,8 @@ class Desugar { @Option( name = "core_library", defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, - optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED, implicitRequirements = "--allow_empty_bootclasspath", help = "Enables rewriting to desugar java.* classes." ) diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexBuilder.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexBuilder.java index 2b9179372c..631c65a4d0 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexBuilder.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexBuilder.java @@ -33,9 +33,9 @@ import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; -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.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -100,9 +100,9 @@ class DexBuilder { @Option( name = "persistent_worker", defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, - optionUsageRestrictions = OptionUsageRestrictions.HIDDEN, + metadataTags = {OptionMetadataTag.HIDDEN}, help = "Run as a Bazel persistent worker." ) public boolean persistentWorker; diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileMerger.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileMerger.java index 376e01315b..df6bc321f3 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileMerger.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileMerger.java @@ -34,7 +34,6 @@ import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; -import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions; import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.io.BufferedOutputStream; import java.io.IOException; @@ -148,9 +147,8 @@ class DexFileMerger { @Option( name = "set-max-idx-number", defaultValue = "" + (DexFormat.MAX_MEMBER_IDX + 1), - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, - optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED, help = "Limit on fields and methods in a single dex file." ) public int maxNumberOfIdxPerDex; |