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

trunk/src/build/java.gypi

Index: trunk/src/build/java.gypi
===================================================================
--- trunk/src/build/java.gypi	(revision 256126)
+++ trunk/src/build/java.gypi	(working copy)
@@ -280,12 +280,16 @@
       'action_name': 'javac_<(_target_name)',
       'message': 'Compiling <(_target_name) java sources',
       'variables': {
-        'java_source_list': '>|(javasources.<(_target_name).gypcmd >!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java"))',
+        'all_src_dirs': [
+          '>(java_in_dir)/src',
+          '>@(additional_src_dirs)',
+          '>@(generated_src_dirs)',
+        ],
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
-        '>(java_source_list)',
+        '>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java")',
         '>@(input_jars_paths)',
         '>@(additional_input_paths)',
       ],
@@ -296,8 +300,7 @@
         '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)',
+        '--src-dirs=>(all_src_dirs)',
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
         '--stamp=<(compile_stamp)',