android: Remove last md5sum call from java.gypi.

process_resources writes all inputs to a filelist, and then passes the md5sum
of the filelist as parameter (so that the commandline changes when inputs are
removed, causing a rerun).

Instead, just make the input filelist another input. gyp writes filelists when
their contents change, so this means if inputs are removed, the mtime of the
filelist will change, also causing a rebuild.

No intended behavior change.

BUG=177552
NOTRY=true

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

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

android/gyp/process_resources.py

@@ -35,9 +35,6 @@ def ParseArgs():
   parser.add_option('--android-manifest', help='AndroidManifest.xml path')
   parser.add_option('--stamp', help='File to touch on success')
 
-  # This is part of a temporary fix for crbug.com/177552.
-  # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
-  parser.add_option('--ignore', help='this argument is ignored')
   (options, args) = parser.parse_args()
 
   if args:

java.gypi

@@ -183,16 +183,16 @@
             # resources in dependencies can be resolved.
             'all_res_dirs': ['<@(res_input_dirs)',
                              '>@(dependencies_res_input_dirs)',],
-            # Write the inputs list to a file, so that the action command
-            # line won't exceed the OS limits when calculating the checksum
-            # of the list.
-            'inputs_list_file': '>|(inputs_list.<(_target_name).gypcmd >@(_inputs))'
+            # Write the inputs list to a file, so that its mtime is updated when
+            # the list of inputs changes.
+            'inputs_list_file': '>|(inputs_list.<(_target_name).gypcmd >@(resource_input_paths) @>(dependencies_res_files))'
           },
           'inputs': [
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/process_resources.py',
             '>@(resource_input_paths)',
             '>@(dependencies_res_files)',
+            '>(inputs_list_file)',
           ],
           'outputs': [
             '<(R_stamp)',
@@ -209,11 +209,6 @@
             '--non-constant-id',
             '--custom-package', '<(R_package)',
             '--stamp', '<(R_stamp)',
-
-            # Add hash of inputs to the command line, so if inputs change
-            # (e.g. if a resource if removed), the command will be re-run.
-            # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
-            '--ignore=>!(md5sum >(inputs_list_file))',
           ],
         },
         # Generate API 14 resources.