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

trunk/src/build/java_apk.gypi

 # Copyright (c) 2012 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 495 matching lines @@
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
       ],
     },
     {
       'action_name': 'javac_<(_target_name)',
       'message': 'Compiling java for <(_target_name)',
       'variables': {
-        'gen_src_dirs': [
+        'all_src_dirs': [
+          '<(java_in_dir)/src',
           '<(intermediate_dir)/gen',
+          '>@(additional_src_dirs)',
           '>@(generated_src_dirs)',
         ],
-        # If there is a separate find for additional_src_dirs, it will find the
-        # wrong .java files when additional_src_dirs is empty.
-        'java_source_list': '>|(javasources.<(_target_name).gypcmd >!@(find >(java_in_dir) >(additional_src_dirs) -name "*.java"))',
-
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
-        '>(java_source_list)',
+        # If there is a separate find for additional_src_dirs, it will find the
+        # wrong .java files when additional_src_dirs is empty.
+        '>!@(find >(java_in_dir) >(additional_src_dirs) -name "*.java")',
         '>@(input_jars_paths)',
         '<(codegen_stamp)',
         '>@(compile_input_paths)',
       ],
       'outputs': [
         '<(compile_stamp)',
       ],
       'action': [
         '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)',
+        '--src-dirs=>(all_src_dirs)',
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
         '--stamp=<(compile_stamp)',
 
         # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
         '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
       ],
     },
     {
       'variables': {
@@ skipping 205 matching lines @@
         '<(DEPTH)/build/android/ant/apk-package.xml',
 
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
       ]
     },
   ],
 }