android: Make javac rules depend on java files too.

Fixes regression from r256667, which made javac only rerun when the list of
java files changed, not when a java file itself was touched :-/

BUG=177552
TEST=touch java file, rebuild. apk gets updated.
R=miguelg@chromium.org

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@256842 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

java.gypi

@@ -280,11 +280,13 @@
       '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"))',
+        '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)',

java_apk.gypi

@@ -525,12 +525,14 @@
         # Java files instead of using find. (As is, this will be broken if two
         # targets use the same java_in_dir and both use java_apk.gypi or
         # both use java.gypi.)
-        'java_source_list': '>|(javasources.<(_target_name).gypcmd >!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java"  # apk))',
+        '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)',