Fix jar_toc.py to include public/protected methods

build/android/gyp/jar_toc.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Creates a TOC file from a Java jar.
 
 The TOC file contains the non-package API of the jar. This includes all
 public/protected/package classes/functions/members and the values of static
@@ skipping 35 matching lines @@
       '-verbose',
       '-J-XX:NewSize=4m',
       '-classpath', classpath
       ] + classes
   return build_utils.CheckOutput(javap_cmd)
 
 
 def ExtractToc(disassembled_classes):
   # javap output is structured by indent (2-space) levels.
   good_patterns = [
-      '^[^ ]', # This includes all class/function/member signatures.
+      '^[^ ]', # This includes all class signatures.
       '^  SourceFile:',
       '^  minor version:',
       '^  major version:',
       '^  Constant value:',
+      '^  public ',
+      '^  protected ',
       ]
   bad_patterns = [
       '^const #', # Matches the constant pool (i.e. literals used in the class).
     ]
 
   def JavapFilter(line):
     return (re.match('|'.join(good_patterns), line) and
         not re.match('|'.join(bad_patterns), line))
   toc = filter(JavapFilter, disassembled_classes.split('\n'))
 
@@ skipping 45 matching lines @@
     build_utils.WriteDepfile(
         options.depfile,
         build_utils.GetPythonDependencies())
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main())