components/cronet/tools/generate_javadoc.py - Issue 2350013004: Upgrade to new Android SDK.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/cronet/tools/generate_javadoc.py

Issue 2350013004: Upgrade to new Android SDK. (Closed)

Patch Set: Document a lint change. Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: components/cronet/tools/generate_javadoc.py

diff --git a/components/cronet/tools/generate_javadoc.py b/components/cronet/tools/generate_javadoc.py

index 3914b91ed235643cbecda7911d1e3ebce6bdf5d6..f3a15162ae9aa5c5b31664d7abab183c14122675 100755

--- a/components/cronet/tools/generate_javadoc.py

+++ b/components/cronet/tools/generate_javadoc.py

@@ -43,7 +43,8 @@ def GenerateJavadoc(options, src_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:

+ # 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!

+ if " error: " in stdout or "javadoc: error " in stdout:

build_utils.DeleteDirectory(output_dir)

raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)