Update JNI generator for javap version 1.8.

base/android/jni_generator/jni_generator_tests.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.
 
 """Tests for jni_generator.py.
 
 This test suite contains various tests for the JNI generator.
 It exercises the low-level parser all the way up to the
 code generator and ensures the output matches a golden
@@ skipping 704 matching lines @@
       implements java.util.Set<E>, java.lang.Cloneable, java.io.Serializable {
     public void dummy();
   Signature: ()V
 }
 """
     jni_from_javap = jni_generator.JNIFromJavaP(contents.split('\n'),
                                                 TestOptions())
     self.assertEquals(1, len(jni_from_javap.called_by_natives))
     self.assertGoldenTextEquals(jni_from_javap.GetContent())
 
-  def testSnippnetJavap6_7(self):
+  def testSnippnetJavap6_7_8(self):
     content_javap6 = """
 public class java.util.HashSet {
 public boolean add(java.lang.Object);
  Signature: (Ljava/lang/Object;)Z
 }
 """
 
     content_javap7 = """
 public class java.util.HashSet {
 public boolean add(E);
   Signature: (Ljava/lang/Object;)Z
 }
 """
+
+    content_javap8 = """
+public class java.util.HashSet {
+  public boolean add(E);
+    descriptor: (Ljava/lang/Object;)Z
+}
+"""
+
     jni_from_javap6 = jni_generator.JNIFromJavaP(content_javap6.split('\n'),
                                                  TestOptions())
     jni_from_javap7 = jni_generator.JNIFromJavaP(content_javap7.split('\n'),
                                                  TestOptions())
+    jni_from_javap8 = jni_generator.JNIFromJavaP(content_javap8.split('\n'),
+                                                 TestOptions())
     self.assertTrue(jni_from_javap6.GetContent())
     self.assertTrue(jni_from_javap7.GetContent())
+    self.assertTrue(jni_from_javap8.GetContent())
     # Ensure the javap7 is correctly parsed and uses the Signature field rather
     # than the "E" parameter.
     self.assertTextEquals(jni_from_javap6.GetContent(),
                           jni_from_javap7.GetContent())
+    # Ensure the javap8 is correctly parsed and uses the descriptor field.
+    self.assertTextEquals(jni_from_javap7.GetContent(),
+                          jni_from_javap8.GetContent())
 
   def testFromJavaP(self):
     contents = self._ReadGoldenFile(os.path.join(os.path.dirname(sys.argv[0]),
         'testInputStream.javap'))
     jni_from_javap = jni_generator.JNIFromJavaP(contents.split('\n'),
                                                 TestOptions())
     self.assertEquals(10, len(jni_from_javap.called_by_natives))
     self.assertGoldenTextEquals(jni_from_javap.GetContent())
 
   def testConstantsFromJavaP(self):
@@ skipping 360 matching lines @@
     }
     """
     jni_from_java = jni_generator.JNIFromJavaSource(test_data,
                                                     'org/chromium/foo/Foo',
                                                     TestOptions())
     self.assertGoldenTextEquals(jni_from_java.GetContent())
 
 
 if __name__ == '__main__':
   unittest.main()