Rollback of commit 32f0333.

*** Reason for rollback ***

This change is no longer needed because commit d9a7d3a is rollbacked

*** Original change description ***

Add --manifest_file option into BazelJavaBuilder 

Now Bazel JavaBuilder can specifiy a file as the manifest file, before
this it just creates the manifest file on the fly.

--
PiperOrigin-RevId: 145534408
MOS_MIGRATED_REVID=145534408

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java

@@ -67,8 +67,6 @@ public final class JavaLibraryBuildRequest {
   private final String classDir;
   private final String tempDir;
 
-  private final String manifestFile;
-
   private JacocoInstrumentationProcessor jacocoInstrumentationProcessor;
 
   private final boolean compressJar;
@@ -158,7 +156,6 @@ public JavaLibraryBuildRequest(
     this.extdir = optionsParser.getExtdir();
     this.processorPath = optionsParser.getProcessorPath();
     this.processorNames = optionsParser.getProcessorNames();
-    this.manifestFile = optionsParser.getManifestFile();
     // Since the default behavior of this tool with no arguments is "rm -fr <classDir>", let's not
     // default to ".", shall we?
     if (optionsParser.getClassDir() != null) {
@@ -267,10 +264,6 @@ public String getTempDir() {
     return tempDir;
   }
 
-  public String getManifestFile() {
-    return manifestFile;
-  }
-
   public JacocoInstrumentationProcessor getJacocoInstrumentationProcessor() {
     return jacocoInstrumentationProcessor;
   }

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java

@@ -55,7 +55,6 @@ public final class OptionsParser {
   private String sourceGenDir;
   private String generatedSourcesOutputJar;
   private String manifestProtoPath;
-  private String manifestFile;
   private final Set<String> sourceRoots = new HashSet<>();
 
   private final List<String> sourceFiles = new ArrayList<>();
@@ -146,9 +145,6 @@ private void processCommandlineArgs(Deque<String> argQueue) throws InvalidComman
         case "--output_manifest_proto":
           manifestProtoPath = getArgument(argQueue, arg);
           break;
-        case "--manifest_file":
-          manifestFile = getArgument(argQueue, arg);
-          break;
         case "--source_roots":
           collectFlagArguments(sourceRoots, argQueue, "-");
           break;
@@ -376,10 +372,6 @@ public String getManifestProtoPath() {
     return manifestProtoPath;
   }
 
-  public String getManifestFile() {
-    return manifestFile;
-  }
-
   public Set<String> getSourceRoots() {
     return sourceRoots;
   }

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/SimpleJavaLibraryBuilder.java

@@ -195,7 +195,6 @@ public void buildJar(JavaLibraryBuildRequest build) throws IOException {
     JarCreator jar = new JarCreator(build.getOutputJar());
     jar.setNormalize(true);
     jar.setCompression(build.compressJar());
-    jar.setManifestFile(build.getManifestFile());
 
     for (String resourceJar : build.getResourceJars()) {
       for (Path root : getJarFileSystem(Paths.get(resourceJar)).getRootDirectories()) {