android: Pass (non-generated) .java files via a gyp filelist to javac.py

build/android/gyp/javac.py

Index: build/android/gyp/javac.py
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index 2f17af9f0f1278640751d3be169f18fbc57b327a..707ba8efdafed4a2fe63a435c15a66d6877c9cd0 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -16,8 +16,9 @@ from util import md5_check
 def DoJavac(options):
   output_dir = options.output_dir
 
-  src_dirs = build_utils.ParseGypList(options.src_dirs)
-  java_files = build_utils.FindInDirectories(src_dirs, '*.java')
+  src_gendirs = build_utils.ParseGypList(options.src_gendirs)
+  java_files = (open(options.src_filelist).read().splitlines() +
+                build_utils.FindInDirectories(src_gendirs, '*.java'))
   if options.javac_includes:
     javac_includes = build_utils.ParseGypList(options.javac_includes)
     filtered_java_files = []
@@ -76,7 +77,9 @@ def DoJavac(options):
 
 def main(argv):
   parser = optparse.OptionParser()
-  parser.add_option('--src-dirs', help='Directories containing java files.')
+  parser.add_option('--src-filelist', help='File list containing java files.')
+  parser.add_option('--src-gendirs',
+      help='Directories containing generated java files.')
   parser.add_option('--javac-includes',
       help='A list of file patterns. If provided, only java files that match' +
         'one of the patterns will be compiled.')