diff options
| author |  ccalvarin <ccalvarin@google.com> | 2017-07-17 21:13:39 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-07-18 09:49:06 +0200 |
| commit | c82a19714dac1210654640ac1f5ca4d96df716a8 (patch) | |
| tree | 11d0f8cb2d0223ce6ccf4fd33de3ffc8fc8c9787 /src/tools/android/java/com/google/devtools/build/android/ziputils | |
| 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/ziputils')
3 files changed, 2 insertions, 5 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD index d5d8428b8d..4f88bf774e 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD @@ -61,7 +61,6 @@ java_binary( deps = [ ":splitter_lib", "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//third_party:guava", ], ) @@ -76,7 +75,6 @@ java_binary( deps = [ ":ziputils_lib", "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", ], ) @@ -91,7 +89,6 @@ java_binary( ":splitter_lib", ":ziputils_lib", "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//third_party:guava", ], ) diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java index 5d76f420d9..e26db4fe31 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java @@ -18,9 +18,9 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; 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.util.List; /** diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java index 66a51adae2..2ba1d9d854 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java @@ -26,9 +26,9 @@ import static com.google.devtools.build.android.ziputils.LocalFileHeader.LOCTIM; 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.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; |