From db8c437ea1858bc8b9e9b2ec6838ed3916d0ce4b Mon Sep 17 00:00:00 2001 From: ccalvarin Date: Thu, 29 Jun 2017 22:47:37 +0200 Subject: Add categories transition values to android options. Automated formatting fixes standardize the @Option annotation. PiperOrigin-RevId: 160567787 --- .../google/devtools/build/android/idlclass/BUILD | 1 + .../build/android/idlclass/IdlClassOptions.java | 86 ++++++++++++++-------- 2 files changed, 57 insertions(+), 30 deletions(-) (limited to 'src/tools/android/java/com/google/devtools/build/android/idlclass') diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD index df2c72607a..1134079193 100644 --- a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD +++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD @@ -31,6 +31,7 @@ java_library( "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:java_compilation_java_proto", + "//src/main/protobuf:option_filters_java_proto", "//src/tools/android/java/com/google/devtools/build/android:android_builder_lib", "//third_party:guava", "//third_party:jsr305", diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClassOptions.java b/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClassOptions.java index fbceb75a33..8106d724ab 100644 --- a/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClassOptions.java +++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClassOptions.java @@ -17,50 +17,76 @@ package com.google.devtools.build.android.idlclass; import com.google.devtools.build.android.Converters.ExistingPathConverter; import com.google.devtools.build.android.Converters.PathConverter; 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.proto.OptionFilters.OptionEffectTag; import java.nio.file.Path; /** The options for a {@IdlClass} action. */ public final class IdlClassOptions extends OptionsBase { - @Option(name = "manifest_proto", - defaultValue = "null", - converter = ExistingPathConverter.class, - category = "input", - help = "The path to the manifest file output by the Java compiler.") + @Option( + name = "manifest_proto", + defaultValue = "null", + converter = ExistingPathConverter.class, + category = "input", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, + help = "The path to the manifest file output by the Java compiler." + ) public Path manifestProto; - @Option(name = "class_jar", - defaultValue = "null", - converter = ExistingPathConverter.class, - category = "input", - help = "The path to the class jar output by the Java compiler.") + @Option( + name = "class_jar", + defaultValue = "null", + converter = ExistingPathConverter.class, + category = "input", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, + help = "The path to the class jar output by the Java compiler." + ) public Path classJar; - @Option(name = "output_class_jar", - defaultValue = "null", - converter = PathConverter.class, - category = "output", - help = "The path to write the class jar output to.") + @Option( + name = "output_class_jar", + defaultValue = "null", + converter = PathConverter.class, + category = "output", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, + help = "The path to write the class jar output to." + ) public Path outputClassJar; - @Option(name = "output_source_jar", - defaultValue = "null", - converter = PathConverter.class, - category = "output", - help = "The path to write the source jar output to.") + @Option( + name = "output_source_jar", + defaultValue = "null", + converter = PathConverter.class, + category = "output", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, + help = "The path to write the source jar output to." + ) public Path outputSourceJar; - @Option(name = "temp_dir", - defaultValue = "null", - converter = PathConverter.class, - category = "input", - help = "The path to a temp directory.") + @Option( + name = "temp_dir", + defaultValue = "null", + converter = PathConverter.class, + category = "input", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, + help = "The path to a temp directory." + ) public Path tempDir; - @Option(name = "idl_source_base_dir", - defaultValue = "null", - converter = PathConverter.class, - category = "input", - help = "The path to the base directory of the idl sources. Optional; Used for testing.") + @Option( + name = "idl_source_base_dir", + defaultValue = "null", + converter = PathConverter.class, + category = "input", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, + help = "The path to the base directory of the idl sources. Optional; Used for testing." + ) public Path idlSourceBaseDir; } -- cgit v1.2.3