Android: fixes for JNI with javap for java7.

base/android/jni_generator/jni_generator_tests.py

Index: base/android/jni_generator/jni_generator_tests.py
diff --git a/base/android/jni_generator/jni_generator_tests.py b/base/android/jni_generator/jni_generator_tests.py
index eaa3f7309e82ad45fe78ec380efbe4f2934c8d3d..542c7c61065a0abed7a67ed66ac275ac5aeedd19 100755
--- a/base/android/jni_generator/jni_generator_tests.py
+++ b/base/android/jni_generator/jni_generator_tests.py
@@ -1658,6 +1658,31 @@ static bool RegisterNativesImpl(JNIEnv* env) {
 """
     self.assertTextEquals(golden_content, jni_from_javap.GetContent())
 
+  def testSnippnetJavap6_7(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
+}
+"""
+    jni_from_javap6 = jni_generator.JNIFromJavaP(content_javap6.split('\n'),
+                                                 TestOptions())
+    jni_from_javap7 = jni_generator.JNIFromJavaP(content_javap7.split('\n'),
+                                                 TestOptions())
+    self.assertTrue(jni_from_javap6.GetContent())
+    self.assertTrue(jni_from_javap7.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())
+
   def testFromJavaP(self):
     contents = """
 public abstract class java.io.InputStream extends java.lang.Object