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

1 files changed, 3 insertions, 4 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
index b5ff067ecb..0e68a6799e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
@@ -41,7 +41,6 @@ import com.google.devtools.build.lib.analysis.Runfiles;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
-import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
@@ -58,6 +57,7 @@ import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
+import com.google.devtools.build.lib.rules.java.JavaConfiguration;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileTypeSet;
 import java.util.List;
@@ -990,12 +990,11 @@ public class TestAspects {
    * Rule with a late-bound dependency.
    */
   public static class LateBoundDepRule implements RuleDefinition {
-    // TODO(b/65746853): provide a way to do this without passing the entire configuration
     private static final LateBoundDefault<?, List<Label>> PLUGINS_LABEL_LIST =
         LateBoundDefault.fromTargetConfiguration(
-            BuildConfiguration.class,
+            JavaConfiguration.class,
             ImmutableList.of(),
-            (rule, attributes, configuration) -> configuration.getPlugins());
+            (rule, attributes, javaConfig) -> javaConfig.getPlugins());
 
     @Override
     public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) {