android: Pass (non-generated) .java files via a gyp filelist to javac.py

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index fc0955f21bcbe56d6aee214ca4a3944440f83acc..a5533197d3d84e1ec900e354a5eee230f71f76ac 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -513,19 +513,19 @@
       'action_name': 'javac_<(_target_name)',
       'message': 'Compiling java for <(_target_name)',
       'variables': {
-        'all_src_dirs': [
-          '<(java_in_dir)/src',
+        'gen_src_dirs': [
           '<(intermediate_dir)/gen',

[cjhopman, 2014/03/11 01:35:57]

Ugh, this path is another hidden dependency (it is constructed from
<(intermediate_dir) in apk-codegen.xml).

-          '>@(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)/src >(additional_src_dirs) -name "*.java"))',

[Nico, 2014/03/11 01:41:59]

I changed the >(java_in_dir) on the lhs to >(java_in_dir)/src, since that's what
was in all_src_dirs. Turns out this caused the red trybot: Both memconsumer and
protobuf.gyp use java_in_dir = 'java' , and gyp caches commands with identical
spelling. So both would evaluate to `find java -name "*.java"`. The reason why
it worked before this patch was that memconsumer included java_apk.gypi and
protobuf included java.gypi, and the former ran find in >(java_in_dir)/src and
the latter in >(java_in_dir) (thus, the two commands weren't completely
identical) (!)

I changed this back to not tack on "/src" for now, but urgh.

…I suppose you don't just list all .java files because of historical reasons
(ant)? Maybe we should move to listing all java files explicitly? (The
alternative is to add some cache-busting piece to the command, but that's urgh
too.)

+
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
-        # 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")',
+        '>(java_source_list)',
         '>@(input_jars_paths)',
         '<(codegen_stamp)',
         '>@(compile_input_paths)',
@@ -537,7 +537,8 @@
         'python', '<(DEPTH)/build/android/gyp/javac.py',
         '--output-dir=<(classes_dir)',
         '--classpath=>(input_jars_paths) <(android_sdk_jar)',
-        '--src-dirs=>(all_src_dirs)',
+        '--src-filelist=>(java_source_list)',
+        '--src-gendirs=>(gen_src_dirs)',
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
         '--stamp=<(compile_stamp)',