Updating JNIAdditionalImport to allow more than one import.

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 errno
@@ skipping 144 matching lines @@
   _inner_classes = []
   _remappings = []
   _implicit_imports = []
 
   @staticmethod
   def SetFullyQualifiedClass(fully_qualified_class):
     JniParams._fully_qualified_class = 'L' + fully_qualified_class
     JniParams._package = '/'.join(fully_qualified_class.split('/')[:-1])
 
   @staticmethod
+  def AddAdditionalImport(class_name):
+    if '.' in class_name:
+      raise SyntaxError('*.class cannot be used in @JNIAdditionalImport. '
+                        'Only import unqualified outer classes.' % class_name)
+    new_import = 'L%s/%s' % (JniParams._package, class_name)
+    if new_import in JniParams._imports:
+      raise SyntaxError('Do not use JNIAdditionalImport on an already '
+                        'imported class: %s' % (new_import.replace('/', '.')))
+    print 'Adding ' + new_import

[bulach, 2014/05/22 16:40:00]

nit: remove

[qsr, 2014/05/22 16:47:55]

Done.

+    JniParams._imports += [new_import]
+
+  @staticmethod
   def ExtractImportsAndInnerClasses(contents):
     if not JniParams._package:
       raise RuntimeError('SetFullyQualifiedClass must be called before '
                          'ExtractImportsAndInnerClasses')
     contents = contents.replace('\n', '')
     re_import = re.compile(r'import.*?(?P<class>\S*?);')
     for match in re.finditer(re_import, contents):
       JniParams._imports += ['L' + match.group('class').replace('.', '/')]
 
     re_inner = re.compile(r'(class|interface)\s+?(?P<name>\w+?)\W')
     for match in re.finditer(re_inner, contents):
       inner = match.group('name')
       if not JniParams._fully_qualified_class.endswith(inner):
         JniParams._inner_classes += [JniParams._fully_qualified_class + '$' +
                                      inner]
 
+    re_additional_import = re.compile(
+        r'@JNIAdditionalImport\((?P<class_name>\w+?)\.class\)')
+    for match in re.finditer(re_additional_import, contents):
+      JniParams.AddAdditionalImport(match.group('class_name'))
+
     re_additional_imports = re.compile(
-        r'@JNIAdditionalImport\((?P<class_name>\w+?)\.class\)')
+        r'@JNIAdditionalImport\({(?P<class_names>.*?)}\)')

[bulach, 2014/05/22 16:40:00]

shouldn't this be sufficient, i.e., remove 193-197 above?

[qsr, 2014/05/22 16:47:55]

 Not necessarly, you can use @JNIAdditionalImport(String.class) when
JNIAdditionalImport expects an array.

     for match in re.finditer(re_additional_imports, contents):
-      class_name = match.group('class_name')
-      if '.' in class_name:
-        raise SyntaxError('*.class cannot be used in @JNIAdditionalImport. '
-                          'Only import unqualified outer classes.' % class_name)
-      new_import = 'L%s/%s' % (JniParams._package, class_name)
-      if new_import in JniParams._imports:
-        raise SyntaxError('Do not use JNIAdditionalImport on an already '
-                          'imported class: %s' % (new_import.replace('/', '.')))
-      JniParams._imports += [new_import]
+      for class_name in match.group('class_names').split(','):
+        JniParams.AddAdditionalImport(class_name.strip()[:-6])

[bulach, 2014/05/22 16:40:00]

hmm, the -6 seems out of place here.
how about just pass class_name.strip() here, then in 165, ensure that
class_name.endswith('.class') and then remove it there?

also, please add a test for the new case

[qsr, 2014/05/22 16:47:55]

Done.

 
   @staticmethod
   def ParseJavaPSignature(signature_line):
     prefix = 'Signature: '
     return '"%s"' % signature_line[signature_line.index(prefix) + len(prefix):]
 
   @staticmethod
   def JavaToJni(param):
     """Converts a java param into a JNI signature type."""
     pod_param_map = {
@@ skipping 1199 matching lines @@
     root_name = os.path.splitext(os.path.basename(input_file))[0]
     output_file = os.path.join(options.output_dir, root_name) + '_jni.h'
   if options.jarjar:
     with open(options.jarjar) as f:
       JniParams.SetJarJarMappings(f.read())
   GenerateJNIHeader(input_file, output_file, options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))