diff options
author | 2017-07-17 21:13:39 +0200 | |
---|---|---|
committer | 2017-07-18 09:49:06 +0200 | |
commit | c82a19714dac1210654640ac1f5ca4d96df716a8 (patch) | |
tree | 11d0f8cb2d0223ce6ccf4fd33de3ffc8fc8c9787 /src/main/java/com/google/devtools/build/lib/pkgcache | |
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/main/java/com/google/devtools/build/lib/pkgcache')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java index c651e25455..fa3bc2e900 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java @@ -18,8 +18,8 @@ import com.google.devtools.build.lib.packages.TestTimeout; import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter; 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; import java.util.Set; diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java index 0f7bbda68a..b23b1b31e9 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java @@ -26,9 +26,9 @@ import com.google.devtools.common.options.Converter; import com.google.devtools.common.options.Converters; 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.OptionsParsingException; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.util.List; /** |