Revert of android: Make dex_action.gypi not call md5sum....

Revert of android: Make dex_action.gypi not call md5sum. (https://codereview.chromium.org/183883024/)

Reason for revert:
Experimentally reverting because it is possible that this CL broke the android build http://build.chromium.org/p/chromium/builders/Android/builds/21418/steps/compile/logs/stdio

Will undo the revert if this CL is innocent

Original issue's description:
> android: Make dex_action.gypi not call md5sum.
> 
> No intended behavior change.
> 
> dex_action.gypi didn't pass its input_paths variable to dex.py,
> but that was only set in a single place, and only to a single file there.
> It was only used in java_apk.gypi which does manual threading of
> stamp files to order actions (since it's a gypi, it can't easily use type
> none targets with dependencies). Since dex.py doesn't look at this
> stamp file at all, the it doesn't need to rerun when the stamp file disappears.
> 
> To make this a bit more obvious, remove dex_action.gypi's input_paths
> variable and set 'inputs' directly in the one place with the stamp file.
> (dex.py will still rerun if the name of the stamp file changes, due to
> regular timestamp handling.)
> 
> BUG=177552
> NOTRY=true
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=255325

TBR=cjhopman@chromium.org,thakis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=177552

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255356 0039d316-1c4b-4281-b951-d872f2087c98

build/android/dex_action.gypi

@@ -14,6 +14,7 @@
 #      'variables': {
 #        'dex_input_paths': [ 'files to dex (when proguard is not used) and add to input paths' ],
 #        'dex_generated_input_dirs': [ 'dirs that contain generated files to dex' ],
+#        'input_paths': [ 'additional files to be added to the list of inputs' ],
 #
 #        # For targets that use proguard:
 #        'proguard_enabled': 'true',
@@ -29,6 +30,7 @@
   'variables': {
     'dex_input_paths': [],
     'dex_generated_input_dirs': [],
+    'input_paths': [],
     'proguard_enabled%': 'false',
     'proguard_enabled_input_path%': '',
     'dex_no_locals%': 0,
@@ -37,6 +39,7 @@
     '<(DEPTH)/build/android/gyp/util/build_utils.py',
     '<(DEPTH)/build/android/gyp/util/md5_check.py',
     '<(DEPTH)/build/android/gyp/dex.py',
+    '>@(input_paths)',
     '>@(dex_input_paths)',
   ],
   'outputs': [
@@ -50,6 +53,10 @@
     '--proguard-enabled=<(proguard_enabled)',
     '--proguard-enabled-input-path=<(proguard_enabled_input_path)',
     '--no-locals=<(dex_no_locals)',
+
+    # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
+    '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
+
     '>@(dex_input_paths)',
     '>@(dex_generated_input_dirs)',
   ]

build/android/gyp/dex.py

@@ -46,6 +46,9 @@ def main(argv):
                     help='Exclude locals list from the dex file.')
   parser.add_option('--stamp', help='Path to touch on success.')
 
+  # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
+  parser.add_option('--ignore', help='Ignored.')
+
   options, paths = parser.parse_args()
 
   if (options.proguard_enabled == 'true'

build/java_apk.gypi

@@ -672,11 +672,11 @@
             'dex_input_paths': [ '<(emma_device_jar)' ],
           }],
         ],
+        'input_paths': [ '<(instr_stamp)' ],
         'dex_input_paths': [ '>@(library_dexed_jars_paths)' ],
         'dex_generated_input_dirs': [ '<(classes_final_dir)' ],
         'output_path': '<(dex_path)',
       },
-      'inputs': [ '<(instr_stamp)', ],
       'includes': [ 'android/dex_action.gypi' ],
     },
     {