summaryrefslogtreecommitdiffstats
path: root/base/android
diff options
context:
space:
mode:
authordtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-05 23:27:41 +0000
committerdtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-05 23:27:41 +0000
commit3e3250c714b0de96f021ba4d59d51f1700b72644 (patch)
tree2a0a3c64f085b87fae66cb6320c9e9d7ac6347ce /base/android
parent715421b72c9d58e73e12d6bd35b7a7b1a1dfa265 (diff)
downloadchromium_src-3e3250c714b0de96f021ba4d59d51f1700b72644.zip
chromium_src-3e3250c714b0de96f021ba4d59d51f1700b72644.tar.gz
chromium_src-3e3250c714b0de96f021ba4d59d51f1700b72644.tar.bz2
Implement annotation support for JS<->Java interface
Instead of relying on a boolean to determine whether or not to rely on the @JavascriptInterface annotation for injected APIs, allow the caller to pass in an annotation that will be placed on the methods they want injected. BUG= Review URL: https://chromiumcodereview.appspot.com/11308356 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android')
-rwxr-xr-xbase/android/jni_generator/jni_generator.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py
index b797cf1..18312c6 100755
--- a/base/android/jni_generator/jni_generator.py
+++ b/base/android/jni_generator/jni_generator.py
@@ -95,7 +95,10 @@ def JavaDataTypeToC(java_type):
'void': 'void',
'String': 'jstring',
'java/lang/String': 'jstring',
+ 'Class': 'jclass',
+ 'java/lang/Class': 'jclass',
}
+
if java_type in java_pod_type_map:
return java_pod_type_map[java_type]
elif java_type in java_type_map:
@@ -151,6 +154,7 @@ class JniParams(object):
'Ljava/lang/Long',
'Ljava/lang/Object',
'Ljava/lang/String',
+ 'Ljava/lang/Class',
]
if param == 'byte[][]':
return '[[B'