jni_generator: Remove annotation order constraints for @NativeMethods.

Previously would fail if another annotation came after @NativeMethods.

Bug: 1018296
Change-Id: Id80385d0a0ad0594134d5e04d87f28f9efd77888
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1885017
Auto-Submit: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710334}

base/android/jni_generator/jni_generator.py

@@ -61,7 +61,7 @@ _EXTRACT_METHODS_REGEX = re.compile(
     flags=re.DOTALL)
 
 _NATIVE_PROXY_EXTRACTION_REGEX = re.compile(
-    r'@NativeMethods\s*(public|private)*\s*interface\s*'
+    r'@NativeMethods[\S\s]+?interface\s*'
     r'(?P<interface_name>\w*)\s*(?P<interface_body>{(\s*.*)+?\s*})')
 
 # Use 100 columns rather than 80 because it makes many lines more readable.

base/android/jni_generator/jni_generator_tests.py

@@ -1421,7 +1421,9 @@ class ProxyTestGenerator(BaseTest):
     test_data = """
     class SampleProxyJni {
       private void do_not_match();
+      @VisibleForTesting
       @NativeMethods
+      @Generated("Test")
       interface Natives {
         @NativeClassQualifiedName("FooAndroid::BarDelegate")
         void foo(long nativePtr);