Android: correctly generates inner class from import clause.

base/android/jni_generator/jni_generator.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Extracts native methods from a Java file and generates the JNI bindings.
 If you change this, please run and update the tests."""
 
 import collections
 import optparse
@@ skipping 150 matching lines @@
       param = param[:-2]
     # Generic?
     if '<' in param:
       param = param[:param.index('<')]
     if param in pod_param_map:
       return prefix + pod_param_map[param]
     if '/' in param:
       # Coming from javap, use the fully qualified param directly.
       return 'L' + param + ';'
     for qualified_name in (object_param_list +
-                           JniParams._imports +
                            [JniParams._fully_qualified_class] +
                            JniParams._inner_classes):
       if (qualified_name.endswith('/' + param) or
           qualified_name.endswith('$' + param.replace('.', '$')) or
           qualified_name == 'L' + param):
         return prefix + qualified_name + ';'
+
+    # Is it Bar from import zoo.foo.Bar ?

[joth, 2012/11/12 21:22:07]

nit: Is it from an inner class import? (e.g. import zoo.Outer.Inner)

[bulach, 2012/11/12 22:10:19]

Done.

+    for qualified_name in JniParams._imports:
+      if qualified_name.endswith('/' + param):
+        # Ensure it's not an inner class.
+        components = qualified_name.split('/')
+        if len(components) > 2 and components[-2][0].isupper():
+          raise SyntaxError('Inner class (%s) can not be imported '
+                            'and used by JNI (%s). Please import the outer '
+                            'class and use Outer.Inner instead.' %
+                            (qualified_name, param))
+        return prefix + qualified_name + ';'
+
+    # Is it an inner class zoo.Foo.Bar from import zoo.Foo?

[joth, 2012/11/12 21:22:07]

Is it an inner class from an outer class import? (e.g. referencing Outer.Inner
from import zoo.Outer).

[bulach, 2012/11/12 22:10:19]

Done.

+    if '.' in param:
+      components = param.split('.')
+      outer = '/'.join(components[:-1])
+      inner = components[-1]
+      for qualified_name in JniParams._imports:
+        if qualified_name.endswith('/' + outer):
+          return prefix + qualified_name + '$' + inner
+
     # Type not found, falling back to same package as this class.
     return prefix + 'L' + JniParams._package + '/' + param + ';'
 
   @staticmethod
   def Signature(params, returns, wrap):
     """Returns the JNI signature for the given datatypes."""
     items = ['(']
     items += [JniParams.JavaToJni(param.datatype) for param in params]
     items += [')']
     items += [JniParams.JavaToJni(returns)]
@@ skipping 780 matching lines @@
     input_file = options.input_file
   output_file = None
   if options.output_dir:
     root_name = os.path.splitext(os.path.basename(input_file))[0]
     output_file = os.path.join(options.output_dir, root_name) + '_jni.h'
   GenerateJNIHeader(input_file, output_file, options.namespace)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))