diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 13:50:04 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 13:50:04 +0000 |
| commit | 12bddbd96525629d64e050a41784c3dacec23466 (patch) | |
| tree | 996f545999bd09f43144ebb6e1c8fcdc6f62d6c6 /base/android | |
| parent | f4730e71d57a6787945f154152f56ff4b7eaf454 (diff) | |
| download | chromium_src-12bddbd96525629d64e050a41784c3dacec23466.zip chromium_src-12bddbd96525629d64e050a41784c3dacec23466.tar.gz chromium_src-12bddbd96525629d64e050a41784c3dacec23466.tar.bz2 | |
Android: fixes missing semi-colon in inner classes for jni_generator.
Qualified classes require a semi-colon in the end.
BUG=
TEST=jni_generator_tests.py
Review URL: https://chromiumcodereview.appspot.com/11819002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android')
| -rwxr-xr-x | base/android/jni_generator/jni_generator.py | 2 | ||||
| -rwxr-xr-x | base/android/jni_generator/jni_generator_tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py index 7ef41f0..60d7242 100755 --- a/base/android/jni_generator/jni_generator.py +++ b/base/android/jni_generator/jni_generator.py @@ -203,7 +203,7 @@ class JniParams(object): inner = components[-1] for qualified_name in JniParams._imports: if qualified_name.endswith('/' + outer): - return prefix + qualified_name + '$' + inner + return prefix + qualified_name + '$' + inner + ';' # Type not found, falling back to same package as this class. return prefix + 'L' + JniParams._package + '/' + param + ';' diff --git a/base/android/jni_generator/jni_generator_tests.py b/base/android/jni_generator/jni_generator_tests.py index eb3563fb..ecc8ed5 100755 --- a/base/android/jni_generator/jni_generator_tests.py +++ b/base/android/jni_generator/jni_generator_tests.py @@ -1912,7 +1912,7 @@ class Foo { jni_generator.JniParams._inner_classes) self.assertTrue('Lorg/chromium/content/app/Foo$PasswordListObserver' in jni_generator.JniParams._inner_classes) - self.assertEquals('Lorg/chromium/content/app/ContentMain$Inner', + self.assertEquals('Lorg/chromium/content/app/ContentMain$Inner;', jni_generator.JniParams.JavaToJni('ContentMain.Inner')) self.assertRaises(SyntaxError, jni_generator.JniParams.JavaToJni, |