Chromium Code Reviews Chromium Code Reviews
Issue 2350013004:
Upgrade to new Android SDK. (Closed)
| OLD | NEW |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright 2015 The Chromium Authors. All rights reserved. | 3 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 import optparse | 7 import optparse |
| 8 import os | 8 import os |
| 9 import sys | 9 import sys |
| 10 import tempfile | 10 import tempfile |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 36 working_dir = os.path.join(options.input_dir, 'android/api') | 36 working_dir = os.path.join(options.input_dir, 'android/api') |
| 37 overview_file = os.path.abspath(options.overview_file) | 37 overview_file = os.path.abspath(options.overview_file) |
| 38 lib_java_dir = os.path.abspath(options.lib_java_dir) | 38 lib_java_dir = os.path.abspath(options.lib_java_dir) |
| 39 | 39 |
| 40 build_utils.DeleteDirectory(output_dir) | 40 build_utils.DeleteDirectory(output_dir) |
| 41 build_utils.MakeDirectory(output_dir) | 41 build_utils.MakeDirectory(output_dir) |
| 42 javadoc_cmd = ['ant', '-Dsource.dir=' + src_dir , '-Ddoc.dir=' + output_dir, | 42 javadoc_cmd = ['ant', '-Dsource.dir=' + src_dir , '-Ddoc.dir=' + output_dir, |
| 43 '-Dlib.java.dir=' + lib_java_dir, '-Doverview=' + overview_file, | 43 '-Dlib.java.dir=' + lib_java_dir, '-Doverview=' + overview_file, |
| 44 'doc'] | 44 'doc'] |
| 45 stdout = build_utils.CheckOutput(javadoc_cmd, cwd=working_dir) | 45 stdout = build_utils.CheckOutput(javadoc_cmd, cwd=working_dir) |
| 46 if " error: " in stdout or "warning" in stdout or "javadoc: error " in stdout: | 46 # TODO(stip): add 'or "warning"' back once compiler situation is resolved. |
|
ghost stip (do not use)
2016/10/13 08:18:14
xunjieli: FYI
xunjieli
2016/10/13 13:45:57
Could you link a bug number here so we can track i
ghost stip (do not use)
2016/10/13 15:56:01
Done!
| |
| 47 if " error: " in stdout or "javadoc: error " in stdout: | |
| 47 build_utils.DeleteDirectory(output_dir) | 48 build_utils.DeleteDirectory(output_dir) |
| 48 raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout) | 49 raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout) |
| 49 | 50 |
| 50 | 51 |
| 51 def main(): | 52 def main(): |
| 52 parser = optparse.OptionParser() | 53 parser = optparse.OptionParser() |
| 53 build_utils.AddDepfileOption(parser) | 54 build_utils.AddDepfileOption(parser) |
| 54 parser.add_option('--output-dir', help='Directory to put javadoc') | 55 parser.add_option('--output-dir', help='Directory to put javadoc') |
| 55 parser.add_option('--input-dir', help='Root of cronet source') | 56 parser.add_option('--input-dir', help='Root of cronet source') |
| 56 parser.add_option('--input-src-jar', help='Cronet api source jar') | 57 parser.add_option('--input-src-jar', help='Cronet api source jar') |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 79 assert options.stamp | 80 assert options.stamp |
| 80 deps = [] | 81 deps = [] |
| 81 for root, _, filenames in os.walk(options.input_dir): | 82 for root, _, filenames in os.walk(options.input_dir): |
| 82 deps.extend(os.path.join(root, f) for f in filenames) | 83 deps.extend(os.path.join(root, f) for f in filenames) |
| 83 build_utils.WriteDepfile(options.depfile, options.stamp, deps) | 84 build_utils.WriteDepfile(options.depfile, options.stamp, deps) |
| 84 # Clean up temporary output directory. | 85 # Clean up temporary output directory. |
| 85 build_utils.DeleteDirectory(unzipped_jar_path) | 86 build_utils.DeleteDirectory(unzipped_jar_path) |
| 86 | 87 |
| 87 if __name__ == '__main__': | 88 if __name__ == '__main__': |
| 88 sys.exit(main()) | 89 sys.exit(main()) |
| OLD | NEW |
