Temporary fix for build break when removing Java files or resources.

This appends the list of inputs to the ant and process_resources.py
commands. Thus when the list of inputs changes, the command line
changes, and ninja will re-run the command.

This will be removed once ninja is updated to automatically rebuild
when the input list changes.

BUG=177449,177552


Review URL: https://chromiumcodereview.appspot.com/12379066

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

android/process_resources.py

@@ -29,6 +29,9 @@ def ParseArgs():
   parser.add_option('--res-dir', help='directory containing resources')
   parser.add_option('--out-res-dir',
                     help='directory to hold crunched resources')
+  # 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

@@ -138,6 +138,11 @@
             '--R-dir', '<(R_dir)',
             '--res-dir', '<(res_dir)',
             '--out-res-dir', '<(out_res_dir)',
+
+            # Add list 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', '>(_inputs)',
           ],
         },
       ],
@@ -174,6 +179,11 @@
         '-DOUT_DIR=<(ant_build_out)/<(_target_name)',
         '-DJAVAC_INCLUDES=>(javac_includes)',
 
+        # 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=>(_inputs)',
+
         '-Dbasedir=<(java_in_dir)',
         '-buildfile',
         '<(DEPTH)/build/android/ant/chromium-jars.xml'

java_apk.gypi

@@ -201,6 +201,11 @@
         '-DPROGUARD_FLAGS=>(proguard_flags)',
         '-DPROGUARD_ENABLED=>(proguard_enabled)',
 
+        # 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=>(_inputs)',
+
         '-Dbasedir=<(java_in_dir)',
         '-buildfile',
         '<(DEPTH)/build/android/ant/chromium-apk.xml',