Handle @Annotated parameters when generating JNI headers from Java.

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 338 matching lines @@
       return '"' + ''.join(items) + '"'
 
   @staticmethod
   def Parse(params):
     """Parses the params into a list of Param objects."""
     if not params:
       return []
     ret = []
     for p in [p.strip() for p in params.split(',')]:
       items = p.split(' ')
+
+      # Remove @Annotations from parameters.
+      if items[0][0] is '@':

[PEConn, 2016/08/23 15:30:12]

It'd be really cool if we could do some magic that converts the int to an
appropriate enum if this is a Java annotation generated from a C++ enum.

[Bernhard Bauer, 2016/08/23 15:33:08]

Hm, but we only use @IntDef enums, which are just integers under the hood
anyway.

[Torne, 2016/08/23 15:40:03]

I'd prefer "if items[0].startswith('@')" - and also can't there be more than one
annotation? (and parameters to the annotation and so on?) Making this fully
general is probably a pain I guess..

And yes, it'd be nice to handle enums/etc properly; if some feels like
implementing that later go ahead ;p

[Bernhard Bauer, 2016/08/25 10:29:05]

OK, I'm now handling any number of annotations, but no parameters yet. Yes, at
some point it would probably start making more sense to use a proper Java
parser.

+        del items[0]
+
       if 'final' in items:
         items.remove('final')
+
       param = Param(
           datatype=items[0],
           name=(items[1] if len(items) > 1 else 'p%s' % len(ret)),
       )
       ret += [param]
     return ret
 
 
 def ExtractJNINamespace(contents):
   re_jni_namespace = re.compile('.*?@JNINamespace\("(.*?)"\)')
@@ skipping 1002 matching lines @@
   GenerateJNIHeader(input_file, output_file, options)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))