diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 23:22:44 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 23:22:44 +0000 |
| commit | 78d628f0560d46fadb6e68fa51807f2806425161 (patch) | |
| tree | 496cbb290e730451ec0342951ebe1200116d0e8e /build | |
| parent | 1cb25aa94f8c177ea3469f959e0359f54b82e659 (diff) | |
| download | chromium_src-78d628f0560d46fadb6e68fa51807f2806425161.zip chromium_src-78d628f0560d46fadb6e68fa51807f2806425161.tar.gz chromium_src-78d628f0560d46fadb6e68fa51807f2806425161.tar.bz2 | |
android: Remove last two md5sum calls from gyp files.
Use the timestamp of a filelist instead of the md5sum call. No intended
behavior change.
BUG=177552
R=cjhopman@chromium.org
Review URL: https://codereview.chromium.org/207093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/java.gypi | 2 | ||||
| -rw-r--r-- | build/java_apk.gypi | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/build/java.gypi b/build/java.gypi index 63f7bcf..546276a 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -185,7 +185,7 @@ '>@(dependencies_res_input_dirs)',], # 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_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))' }, 'inputs': [ '<(DEPTH)/build/android/gyp/util/build_utils.py', diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 4d39f1a..ed4f714 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -471,6 +471,11 @@ } }], ], + 'variables': { + # Write the inputs list to a file, so that its mtime is updated when + # the list of inputs changes. + 'inputs_list_file': '>|(apk_codegen.<(_target_name).gypcmd >@(additional_input_paths) >@(resource_input_paths))' + }, 'inputs': [ '<(DEPTH)/build/android/ant/apk-codegen.xml', '<(DEPTH)/build/android/gyp/util/build_utils.py', @@ -478,6 +483,7 @@ '<(android_manifest_path)', '>@(additional_input_paths)', '>@(resource_input_paths)', + '>(inputs_list_file)', ], 'outputs': [ '<(codegen_stamp)', @@ -500,11 +506,6 @@ '-Dbasedir=.', '-buildfile', '<(DEPTH)/build/android/ant/apk-codegen.xml', - - # 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=>!(echo \'>(_inputs)\' | md5sum)', ], }, { @@ -728,6 +729,11 @@ { 'action_name': 'ant_package_<(_target_name)', 'message': 'Packaging <(_target_name)', + 'variables': { + # Write the inputs list to a file, so that its mtime is updated when + # the list of inputs changes. + 'inputs_list_file': '>|(apk_package.<(_target_name).gypcmd >@(package_input_paths))' + }, 'inputs': [ '<(DEPTH)/build/android/ant/apk-package.xml', '<(DEPTH)/build/android/gyp/util/build_utils.py', @@ -737,6 +743,7 @@ '<(obfuscate_stamp)', '<(package_resources_stamp)', '>@(package_input_paths)', + '>(inputs_list_file)', ], 'outputs': [ '<(unsigned_apk_path)', @@ -758,11 +765,6 @@ '-Dbasedir=.', '-buildfile', '<(DEPTH)/build/android/ant/apk-package.xml', - - # 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=>!(echo \'>(_inputs)\' | md5sum)', ] }, ], |