diff options
| author |  mstaib <mstaib@google.com> | 2017-09-26 01:42:15 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-09-26 12:31:12 +0200 |
| commit | 7e918290f5d2aee85347ea45d89d05675a40817f (patch) | |
| tree | 4c8401dc54ae076a401b37e9fcc996656afe790d /src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java | |
| parent | 1752ae8451fe556de85972d245e1f85fcdbe5e19 (diff) | |
Move --plugin to JavaOptions and remove --plugin_copt.
--plugin, though once used for C++, is currently a Java-specific flag.
--plugin_copt is currently a total no-op, and has been for a long time.
Moving these to the Java fragment is a little neater and helps get one
step closer to enforcing LateBoundDefault fragment access.
Additionally, since the "no plugins with duplicate names" restriction
was added to work with plugin_copt, this restriction can be lifted.
It no longer adds any value.
RELNOTES: None.
PiperOrigin-RevId: 169981221
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java index ca43c7e92e..0dd4ab0b87 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java @@ -171,12 +171,11 @@ public interface JavaSemantics { return javaConfig.getJavaLauncherLabel(); }); - // TODO(b/65746853): provide a way to do this without passing the entire configuration LateBoundDefault<?, List<Label>> JAVA_PLUGINS = LateBoundDefault.fromTargetConfiguration( - BuildConfiguration.class, + JavaConfiguration.class, ImmutableList.of(), - (rule, attributes, configuration) -> ImmutableList.copyOf(configuration.getPlugins())); + (rule, attributes, javaConfig) -> ImmutableList.copyOf(javaConfig.getPlugins())); /** Implementation for the :proguard attribute. */ LateBoundDefault<?, Label> PROGUARD = |