[Reland] Upgrade to new Android SDK.

components/cronet/tools/generate_javadoc.py

 #!/usr/bin/env python
 #
 # Copyright 2015 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
 import tempfile
@@ skipping 25 matching lines @@
   working_dir = os.path.join(options.input_dir, 'android/api')
   overview_file = os.path.abspath(options.overview_file)
   lib_java_dir = os.path.abspath(options.lib_java_dir)
 
   build_utils.DeleteDirectory(output_dir)
   build_utils.MakeDirectory(output_dir)
   javadoc_cmd = ['ant', '-Dsource.dir=' + src_dir , '-Ddoc.dir=' + output_dir,
              '-Dlib.java.dir=' + lib_java_dir, '-Doverview=' + overview_file,
              'doc']
   stdout = build_utils.CheckOutput(javadoc_cmd, cwd=working_dir)
-  if " error: " in stdout or "warning" in stdout or "javadoc: error " in stdout:
-    build_utils.DeleteDirectory(output_dir)
-    raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
+  for line in stdout.splitlines():

[ghost stip (do not use), 2016/10/20 20:52:04]

xunjieli: wdyt? I tested it and it definitely raises an error unless the only
warning is "the highest major version"

[xunjieli, 2016/10/20 20:58:54]

Seems good to me :)

+    if " error: " in line or "javadoc: error " in line:
+      build_utils.DeleteDirectory(output_dir)
+      raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
+    # TODO(crbug.com/655666): remove compiler  suppression warning once fixed.
+    if ("warning" in line and not line.endswith('warnings') and

[ghost stip (do not use), 2016/10/20 20:52:04]

the endswith is because at the end it displays "664 warnings"

[xunjieli, 2016/10/20 20:58:55]

Acknowledged.

+        not "the highest major version" in line):
+      build_utils.DeleteDirectory(output_dir)

[ghost stip (do not use), 2016/10/20 20:52:04]

I felt the if statement was complicated enough that some code duplication was OK

[xunjieli, 2016/10/20 20:58:54]

Acknowledged.

+      raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
 
 
 def main():
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
   parser.add_option('--output-dir', help='Directory to put javadoc')
   parser.add_option('--input-dir', help='Root of cronet source')
   parser.add_option('--input-src-jar', help='Cronet api source jar')
   parser.add_option('--overview-file', help='Path of the overview page')
   parser.add_option('--readme-file', help='Path of the README.md')
@@ skipping 20 matching lines @@
     assert options.stamp
     deps = []
     for root, _, filenames in os.walk(options.input_dir):
       deps.extend(os.path.join(root, f) for f in filenames)
     build_utils.WriteDepfile(options.depfile, options.stamp, deps)
   # Clean up temporary output directory.
   build_utils.DeleteDirectory(unzipped_jar_path)
 
 if __name__ == '__main__':
   sys.exit(main())