android: Pass list of java files as command line, instead of through a file list.

There aren't that many java files, so this should be well below the command
length file system limit. (Checked with `find. -name '*.java' | wc`).

No intended behavior change.

BUG=177552
NOTRY=true

Review URL: https://codereview.chromium.org/197213006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257467 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 12 deletions

diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index 707ba8e..f61d212 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -13,12 +13,11 @@ from util import build_utils
 from util import md5_check
 
 
-def DoJavac(options):
+def DoJavac(options, args):
   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'))
+  java_files = args + build_utils.FindInDirectories(src_gendirs, '*.java')
   if options.javac_includes:
     javac_includes = build_utils.ParseGypList(options.javac_includes)
     filtered_java_files = []
@@ -77,7 +76,6 @@ def DoJavac(options):
 
 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('--javac-includes',
@@ -93,9 +91,9 @@ def main(argv):
   # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
   parser.add_option('--ignore', help='Ignored.')
 
-  options, _ = parser.parse_args()
+  options, args = parser.parse_args()
 
-  DoJavac(options)
+  DoJavac(options, args)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
diff --git a/build/java.gypi b/build/java.gypi
index 015de75..63f7bcf 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -276,13 +276,11 @@
       'message': 'Compiling <(_target_name) java sources',
       'variables': {
         'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java")'],
-        'java_source_list': '>|(javasources.<(_target_name).gypcmd >@(java_sources))',
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
         '>@(java_sources)',
-        '>(java_source_list)',
         '>@(input_jars_paths)',
         '>@(additional_input_paths)',
       ],
@@ -293,11 +291,11 @@
         'python', '<(DEPTH)/build/android/gyp/javac.py',
         '--output-dir=<(classes_dir)',
         '--classpath=>(input_jars_paths)',
-        '--src-filelist=>(java_source_list)',
         '--src-gendirs=>(generated_src_dirs)',
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
         '--stamp=<(compile_stamp)',
+        '>@(java_sources)',
       ]
     },
     {
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index d8d8e9d..cd8eeb4 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -526,14 +526,12 @@
         # targets use the same java_in_dir and both use java_apk.gypi or
         # both use java.gypi.)
         'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java"  # apk)'],
-        'java_source_list': '>|(javasources.<(_target_name).gypcmd >@(java_sources))',
 
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
         '>@(java_sources)',
-        '>(java_source_list)',
         '>@(input_jars_paths)',
         '<(codegen_stamp)',
       ],
@@ -549,11 +547,11 @@
         'python', '<(DEPTH)/build/android/gyp/javac.py',
         '--output-dir=<(classes_dir)',
         '--classpath=>(input_jars_paths) <(android_sdk_jar)',
-        '--src-filelist=>(java_source_list)',
         '--src-gendirs=>(gen_src_dirs)',
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
         '--stamp=<(compile_stamp)',
+        '>@(java_sources)',
       ],
     },
     {