Make JavaCompileAction and friends emit new-style arguments.

Instead of --direct_dependency, --indirect_dependency args we now emit --direct_dependencies. We no longer need to emit any jar owner information since that is baked into the jar by JavaBuilder.

This CL also contains the deletion of CustomMultiArgv and the injecting_rule_kind aspect parameter, as the deleted code was the last remaining usage.

RELNOTES: None
PiperOrigin-RevId: 187558628

1 files changed, 0 insertions, 26 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
index e90f856709..8e999b5518 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
@@ -102,25 +102,6 @@ public final class CustomCommandLine extends CommandLine {
     abstract void addToFingerprint(ActionKeyContext actionKeyContext, Fingerprint fingerprint);
   }
 
-  /** Deprecated. Do not use. TODO(b/64841073): Remove this */
-  @Deprecated
-  public abstract static class CustomMultiArgv extends StandardArgvFragment {
-
-    @Override
-    void eval(ImmutableList.Builder<String> builder) {
-      builder.addAll(argv());
-    }
-
-    public abstract Iterable<String> argv();
-
-    @Override
-    final void addToFingerprint(ActionKeyContext actionKeyContext, Fingerprint fingerprint) {
-      for (String arg : argv()) {
-        fingerprint.addString(arg);
-      }
-    }
-  }
-
   /**
    * An ArgvFragment that expands a collection of objects in a user-specified way.
    *
@@ -1014,13 +995,6 @@ public final class CustomCommandLine extends CommandLine {
       return addVectorArgInternal(arg, vectorArg);
     }
 
-    public Builder addCustomMultiArgv(@Nullable CustomMultiArgv arg) {
-      if (arg != null) {
-        arguments.add(arg);
-      }
-      return this;
-    }
-
     /**
      * Adds a placeholder TreeArtifact exec path. When the command line is used in an action
      * template, the placeholder will be replaced by the exec path of a {@link TreeFileArtifact}