diff options
author | 2017-07-17 21:13:39 +0200 | |
---|---|---|
committer | 2017-07-18 09:49:06 +0200 | |
commit | c82a19714dac1210654640ac1f5ca4d96df716a8 (patch) | |
tree | 11d0f8cb2d0223ce6ccf4fd33de3ffc8fc8c9787 /src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java | |
parent | 3beea11f340029e763880631c15cd84eee440d42 (diff) |
Make the @Option annotation depend on the java version of the tagging enums.
The option filters proto dependency can be removed from the OptionsParser. This is in response to option parser users that want to avoid the bazel-internal proto file in their dependencies.
RELNOTES: None.
PiperOrigin-RevId: 162249778
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java index 1257ba6b0c..1862fc238f 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java @@ -25,9 +25,9 @@ import com.google.devtools.build.android.Converters.PathConverter; import com.google.devtools.build.android.Converters.StringDictionaryConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; |