Revert 256097 "android: Pass (non-generated) .java files via a g..."

trunk/src/build/android/gyp/javac.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.
 
 import fnmatch
 import optparse
 import os
 import sys
 
 from util import build_utils
 from util import md5_check
 
 
 def DoJavac(options):
   output_dir = options.output_dir
 
-  src_gendirs = build_utils.ParseGypList(options.src_gendirs)
-  java_files = (open(options.src_filelist).read().splitlines() +
-                build_utils.FindInDirectories(src_gendirs, '*.java'))
+  src_dirs = build_utils.ParseGypList(options.src_dirs)
+  java_files = build_utils.FindInDirectories(src_dirs, '*.java')
   if options.javac_includes:
     javac_includes = build_utils.ParseGypList(options.javac_includes)
     filtered_java_files = []
     for f in java_files:
       for include in javac_includes:
         if fnmatch.fnmatch(f, include):
           filtered_java_files.append(f)
           break
     java_files = filtered_java_files
 
@@ skipping 38 matching lines @@
   record_path = '%s/javac.md5.stamp' % options.output_dir
   md5_check.CallAndRecordIfStale(
       Compile,
       record_path=record_path,
       input_paths=java_files + jar_inputs,
       input_strings=javac_cmd)
 
 
 def main(argv):
   parser = optparse.OptionParser()
-  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('--src-dirs', help='Directories containing 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.')
   parser.add_option('--classpath', help='Classpath for javac.')
   parser.add_option('--output-dir', help='Directory for javac output.')
   parser.add_option('--stamp', help='Path to touch on success.')
   parser.add_option('--chromium-code', type='int', help='Whether code being '
                     'compiled should be built with stricter warnings for '
                     'chromium code.')
 
   # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
   parser.add_option('--ignore', help='Ignored.')
 
   options, _ = parser.parse_args()
 
   DoJavac(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))