Include generated EffectiveConnectionType.java in cronet api jar and JavaDoc

components/cronet/tools/jar_src.py

 #!/usr/bin/env python
 #
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import optparse
 import os
 import sys
 
@@ skipping 10 matching lines @@
   # options.src_dir so the .java file paths in the jar are correct.
   jar_cwd = src_dir
   jar_path = os.path.abspath(jar_path)
   if os.path.exists(jar_path):
     jar_cmd = ['jar', 'uf', jar_path, '.']
   else:
     jar_cmd = ['jar', 'cf', jar_path, '.']
 
   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):
+    # Need to execute the jar command inside the temporary directory, and that
+    # is why the ../../ is needed.
+    jar_cmd = ['jar', 'xf', '../../' + jar]

[kapishnikov, 2016/08/12 15:33:39]

Can we use os.path.abspath here instead of "../../" to break the relative path
dependency between "jar" & "unzipped_jar_path"?

[xunjieli, 2016/08/12 17:52:58]

We need to execute the jar command inside the temporary directory, so that all
unzipped jars' java files can be in one place.
I am not sure if there is a way to do it differently.

out/Debug/cronet/1.jar
out/Debug/cronet/2.jar
cd out/Debug/cronet/tmpdir/; jar xf ../1.jar; jar xf ../2.jar
All sources will now be found in out/Debug/cronet/tmpdir/

[kapishnikov, 2016/08/12 19:18:51]

I was thinking of something like:
jar_cmd = ['jar', 'xf', os.path.abspath(jar)]
build_utils.CheckOutput(jar_cmd, cwd=unzipped_jar_path)

[xunjieli, 2016/08/12 19:30:44]

Ah, that's very smart. Why I didn't think of that. Thanks for the suggestion!
Done.

+    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 = os.path.join(os.path.dirname(options.jar_path), 'tmp')
+    build_utils.MakeDirectory(unzipped_jar_path)

[kapishnikov, 2016/08/12 15:33:39]

Similar to the previous comment, make sure that the directory does not exist.

[xunjieli, 2016/08/12 17:52:58]

Done.

+    jar_list = []
+    for gyp_list in options.src_jars:

[kapishnikov, 2016/08/12 15:33:39]

Rename "gyp_list" to "gn_list"?

[xunjieli, 2016/08/12 17:52:58]

Done.

+      jar_list.extend(build_utils.ParseGypList(gyp_list))

[kapishnikov, 2016/08/12 15:33:39]

ParseGypList => ParseGnList?

[xunjieli, 2016/08/12 17:52:58]

Done.

+
+    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)
 
   if options.depfile:
     input_paths = []
     for src_dir in src_dirs:
       for root, _, filenames in os.walk(src_dir):
         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)
 
 if __name__ == '__main__':
   sys.exit(main())