Revert of Include generated EffectiveConnectionType.java in cronet api jar and JavaDoc

components/cronet/tools/jar_src.py

Index: components/cronet/tools/jar_src.py
diff --git a/components/cronet/tools/jar_src.py b/components/cronet/tools/jar_src.py
index 7e73f48b4ca8c9c1cf5569c8e1c264ce6cde668f..4470eb8cf40670b54502ab55709897c164b7171e 100755
--- a/components/cronet/tools/jar_src.py
+++ b/components/cronet/tools/jar_src.py
@@ -7,7 +7,6 @@
 import optparse
 import os
 import sys
-import tempfile
 
 REPOSITORY_ROOT = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', '..'))
@@ -29,43 +28,20 @@
 
   build_utils.CheckOutput(jar_cmd, cwd=jar_cwd)
 
-# Uncompress source jars so that they can be combined with other sources
-def UnzipSourceJar(jar, unzipped_jar_path):
-  if os.path.exists(jar):
-    jar_cmd = ['jar', 'xf', os.path.abspath(jar)]
-    build_utils.CheckOutput(jar_cmd, cwd=unzipped_jar_path)
-  else:
-    raise Exception('Jar file does not exist %s' % jar)
-
 
 def main():
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
   parser.add_option('--src-dir', action="append",
       help='Directory containing .java files.')
-  parser.add_option('--src-jars', action="append",
-      help='A list of source jars to include in addition to source files.')
   parser.add_option('--jar-path', help='Jar output path.')
   parser.add_option('--stamp', help='Path to touch on success.')
 
   options, _ = parser.parse_args()
 
-  # A temporary directory to put the output of jar files.
-  unzipped_jar_path = None
-  if options.src_jars:
-    unzipped_jar_path = tempfile.mkdtemp(dir=os.path.dirname(options.jar_path))
-    jar_list = []
-    for gn_list in options.src_jars:
-      jar_list.extend(build_utils.ParseGnList(gn_list))
-
-    for jar in jar_list:
-      UnzipSourceJar(jar, unzipped_jar_path)
-
   src_dirs = []
   for src_dir in options.src_dir:
     src_dirs.extend(build_utils.ParseGypList(src_dir))
-  if unzipped_jar_path:
-    src_dirs += [unzipped_jar_path]
 
   for src_dir in src_dirs:
     JarSources(src_dir, options.jar_path)
@@ -77,9 +53,6 @@
         input_paths.extend(os.path.join(root, f) for f in filenames)
     build_utils.WriteDepfile(options.depfile,
                              input_paths + build_utils.GetPythonDependencies())
-  # Clean up temporary output directory.
-  if unzipped_jar_path:
-    build_utils.DeleteDirectory(unzipped_jar_path)
 
   if options.stamp:
     build_utils.Touch(options.stamp)