Remove support for non-proto deps files

--
MOS_MIGRATED_REVID=118488877

5 files changed, 13 insertions, 54 deletions

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/AbstractJavaBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/AbstractJavaBuilder.java
index 35f50a4d94..5e04ffb60d 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/AbstractJavaBuilder.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/AbstractJavaBuilder.java
@@ -164,7 +164,6 @@ public abstract class AbstractJavaBuilder extends AbstractLibraryBuilder {
       }
       successful = true;
     } finally {
-      build.getDependencyModule().emitUsedClasspath(build.getClassPath());
       build.getDependencyModule().emitDependencyInformation(build.getClassPath(), successful);
       build.getProcessingModule().emitManifestProto();
       shutdown(err);
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
index 8f6e735887..b619e940a9 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
@@ -119,9 +119,6 @@ public final class JavaLibraryBuildRequest {
     if (optionsParser.getStrictJavaDeps() != null) {
       depsBuilder.setStrictJavaDeps(optionsParser.getStrictJavaDeps());
     }
-    if (optionsParser.getOutputDepsFile() != null) {
-      depsBuilder.setOutputDepsFile(optionsParser.getOutputDepsFile());
-    }
     if (optionsParser.getOutputDepsProtoFile() != null) {
       depsBuilder.setOutputDepsProtoFile(optionsParser.getOutputDepsProtoFile());
     }
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
index 0e61b1034a..987b80926a 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
@@ -43,7 +43,6 @@ public final class OptionsParser {
 
   private String strictJavaDeps;
 
-  private String outputDepsFile;
   private String outputDepsProtoFile;
   private final Set<String> depsArtifacts = new HashSet<>();
 
@@ -123,9 +122,6 @@ public final class OptionsParser {
         case "--strict_java_deps":
           strictJavaDeps = getArgument(argQueue, arg);
           break;
-        case "--output_deps":
-          outputDepsFile = getArgument(argQueue, arg);
-          break;
         case "--output_deps_proto":
           outputDepsProtoFile = getArgument(argQueue, arg);
           break;
@@ -318,10 +314,6 @@ public final class OptionsParser {
     return strictJavaDeps;
   }
 
-  public String getOutputDepsFile() {
-    return outputDepsFile;
-  }
-
   public String getOutputDepsProtoFile() {
     return outputDepsProtoFile;
   }
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
index c32f98339c..974bec3318 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
@@ -24,11 +24,9 @@ import com.google.devtools.build.lib.view.proto.Deps.Dependency.Kind;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -76,7 +74,6 @@ public final class DependencyModule {
   private final Set<String> depsArtifacts;
   private final String ruleKind;
   private final String targetLabel;
-  private final String outputDepsFile;
   private final String outputDepsProtoFile;
   private final Set<String> usedClasspath;
   private final Map<String, Deps.Dependency> explicitDependenciesMap;
@@ -92,7 +89,6 @@ public final class DependencyModule {
                    Set<String> depsArtifacts,
                    String ruleKind,
                    String targetLabel,
-                   String outputDepsFile,
                    String outputDepsProtoFile,
                    String fixMessage,
                    Set<String> exemptGenerators) {
@@ -103,7 +99,6 @@ public final class DependencyModule {
     this.depsArtifacts = depsArtifacts;
     this.ruleKind = ruleKind;
     this.targetLabel = targetLabel;
-    this.outputDepsFile = outputDepsFile;
     this.outputDepsProtoFile = outputDepsProtoFile;
     this.explicitDependenciesMap = new HashMap<>();
     this.implicitDependenciesMap = new HashMap<>();
@@ -120,25 +115,6 @@ public final class DependencyModule {
   }
 
   /**
-   * Writes the true, used compile-time classpath to the deps file, if specified.
-   */
-  public void emitUsedClasspath(String classpath) throws IOException {
-    if (outputDepsFile != null) {
-      try (BufferedWriter out = new BufferedWriter(new FileWriter(outputDepsFile))) {
-        // Filter using the original classpath, to preserve ordering.
-        for (String entry : classpath.split(":")) {
-          if (usedClasspath.contains(entry)) {
-            out.write(entry);
-            out.newLine();
-          }
-        }
-      } catch (IOException ex) {
-        throw new IOException("Cannot write dependencies to " + outputDepsFile, ex);
-      }
-    }
-  }
-
-  /**
    * Writes dependency information to the deps file in proto format, if specified.
    *
    * This is a replacement for {@link #emitUsedClasspath} above, which only outputs the used
@@ -237,8 +213,8 @@ public final class DependencyModule {
   /**
    * Returns the file name collecting dependency information.
    */
-  public String getOutputDepsFile() {
-    return outputDepsFile;
+  public String getOutputDepsProtoFile() {
+    return outputDepsProtoFile;
   }
 
   @VisibleForTesting
@@ -344,7 +320,6 @@ public final class DependencyModule {
     private final Set<String> depsArtifacts = new HashSet<>();
     private String ruleKind;
     private String targetLabel;
-    private String outputDepsFile;
     private String outputDepsProtoFile;
     private boolean strictClasspathMode = false;
     private String fixMessage = "%s** Please add the following dependencies:%s\n"
@@ -359,9 +334,17 @@ public final class DependencyModule {
      * @return an instance of DependencyModule
      */
     public DependencyModule build() {
-      return new DependencyModule(strictJavaDeps, directJarsToTargets, indirectJarsToTargets,
-          strictClasspathMode, depsArtifacts, ruleKind, targetLabel, outputDepsFile,
-          outputDepsProtoFile, fixMessage, exemptGenerators);
+      return new DependencyModule(
+          strictJavaDeps,
+          directJarsToTargets,
+          indirectJarsToTargets,
+          strictClasspathMode,
+          depsArtifacts,
+          ruleKind,
+          targetLabel,
+          outputDepsProtoFile,
+          fixMessage,
+          exemptGenerators);
     }
 
     /**
@@ -446,17 +429,6 @@ public final class DependencyModule {
     }
 
     /**
-     * Sets the name of the file that will contain dependency information.
-     *
-     * @param outputDepsFile output file name for dependency information
-     * @return this Builder instance
-     */
-    public Builder setOutputDepsFile(String outputDepsFile) {
-      this.outputDepsFile = outputDepsFile;
-      return this;
-    }
-
-    /**
      * Sets the name of the file that will contain dependency information in the protocol buffer
      * format.
      *
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java
index 88393958ec..8a3041d6f0 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java
@@ -205,7 +205,6 @@ public class JavacTurbine implements AutoCloseable {
     }
 
     emitClassJar(Paths.get(turbineOptions.outputFile()), compileResult);
-    dependencyModule.emitUsedClasspath(CLASSPATH_JOINER.join(actualClasspath));
     dependencyModule.emitDependencyInformation(
         CLASSPATH_JOINER.join(actualClasspath), compileResult.success());