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/benchmark | |
| 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/benchmark')
4 files changed, 2 insertions, 6 deletions
diff --git a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BUILD b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BUILD index 6dae2a1d65..b44c70fddc 100644 --- a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BUILD +++ b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BUILD @@ -19,7 +19,6 @@ java_binary( "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator:codegenerator_lib", "//third_party:auto_value", "//third_party:guava", @@ -37,7 +36,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator:codegenerator_lib", "//third_party:auto_value", "//third_party:guava", diff --git a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BenchmarkOptions.java b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BenchmarkOptions.java index 840ae744d3..3865b1c3c5 100644 --- a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BenchmarkOptions.java +++ b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BenchmarkOptions.java @@ -16,8 +16,8 @@ package com.google.devtools.build.benchmark; 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.proto.OptionFilters.OptionEffectTag; import java.util.List; /** Class that contains arguments for running the benchmark. */ diff --git a/src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator/BUILD b/src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator/BUILD index 763b9daadc..76a2ad8952 100644 --- a/src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator/BUILD +++ b/src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator/BUILD @@ -6,7 +6,6 @@ java_binary( main_class = "com.google.devtools.build.benchmark.codegenerator.Main", deps = [ "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//third_party:guava", "//third_party/java/javapoet", ], @@ -17,7 +16,6 @@ java_library( srcs = glob(["*.java"]), deps = [ "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//third_party:guava", "//third_party/java/javapoet", ], diff --git a/src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator/GeneratorOptions.java b/src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator/GeneratorOptions.java index 6524fadb7f..5f8cdb44e9 100644 --- a/src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator/GeneratorOptions.java +++ b/src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator/GeneratorOptions.java @@ -16,8 +16,8 @@ package com.google.devtools.build.benchmark.codegenerator; 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.proto.OptionFilters.OptionEffectTag; import java.util.List; /** Class that contains arguments for the java files generator. */ |