base/android/jni_generator/jni_generator.py - Issue 2386713002: Ignore return type annotations in @CalledByNative methods.

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: base/android/jni_generator/jni_generator.py

Issue 2386713002: Ignore return type annotations in @CalledByNative methods. (Closed)

Patch Set: Make regex normal Created 4 years, 3 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: base/android/jni_generator/jni_generator.py

diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py

index 7aff0968d3a1f79953153588a4f7c88ab4ddb301..007fedf77fe0138aa3cc3c5722def6bda287a76a 100755

--- a/base/android/jni_generator/jni_generator.py

+++ b/base/android/jni_generator/jni_generator.py

@@ -518,6 +518,7 @@ RE_SCOPED_JNI_TYPES = re.compile('jobject|jclass|jstring|jthrowable|.*Array')

RE_CALLED_BY_NATIVE = re.compile(

'@CalledByNative(?P<Unchecked>(Unchecked)*?)(?:\("(?P<annotation>.*)"\))?'

'\s+(?P<prefix>[\w ]*?)'

+ '(:?\s*@\w+)?' # Ignore annotations in return types.

'\s*(?P<return_type>\S+?)'

'\s+(?P<name>\w+)'

'\s*\((?P<params>[^\)]*)\)')

« no previous file with comments | « no previous file | base/android/jni_generator/jni_generator_tests.py » ('j') | no next file with comments »