Remove the callback that allowed excluding files from deletion.

--
MOS_MIGRATED_REVID=101555261

2 files changed, 2 insertions, 12 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 8c41d528ec..31da43e2af 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
@@ -44,11 +44,6 @@ public abstract class AbstractJavaBuilder extends AbstractLibraryBuilder {
   /** Enables more verbose output from the compiler. */
   protected boolean debug = false;
 
-  @Override
-  protected boolean keepFileDuringCleanup(File file) {
-    return false;
-  }
-
   /**
    * Flush the buffers of this JavaBuilder
    */
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/AbstractLibraryBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/AbstractLibraryBuilder.java
index cf1c985b0f..e762ad86e0 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/AbstractLibraryBuilder.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/AbstractLibraryBuilder.java
@@ -252,9 +252,8 @@ public abstract class AbstractLibraryBuilder extends CommonJavaLibraryProcessor
    * Recursively cleans up the files beneath the specified output directory.
    * Does not follow symbolic links. Throws IOException if any deletion fails.
    * If removeEverything is false, keeps .class files if keepClassFilesDuringCleanup()
-   * returns true, and also keeps all flags.xml files.
-   * If removeEverything is true, removes everything.
-   * Will delete all empty directories.
+   * returns true. If removeEverything is true, removes everything. Will delete all
+   * empty directories.
    *
    * @param dir the directory to clean up.
    * @param removeEverything whether to remove all files, or keep flags.xml/.class files.
@@ -270,8 +269,6 @@ public abstract class AbstractLibraryBuilder extends CommonJavaLibraryProcessor
       } else if (!removeEverything && keepClassFilesDuringCleanup() &&
           file.getName().endsWith(".class")) {
         isEmpty = false;
-      } else if (!removeEverything && keepFileDuringCleanup(file)) {
-        isEmpty = false;
       } else {
         file.delete();
       }
@@ -282,8 +279,6 @@ public abstract class AbstractLibraryBuilder extends CommonJavaLibraryProcessor
     return isEmpty;
   }
 
-  protected abstract boolean keepFileDuringCleanup(File file);
-
   /**
    * Returns true if cleaning the output directory should remove all
    * .class files in the output directory.