diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 13:11:06 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 13:11:06 +0000 |
| commit | bf1c37755a90bdcbda1d2b7b6dd75e2835b0afdb (patch) | |
| tree | 553246185ff5c961fe1a4c9436fe975da4814905 | |
| parent | fa07f657dae11ae06f3f2866303d6970222faf18 (diff) | |
| download | chromium_src-bf1c37755a90bdcbda1d2b7b6dd75e2835b0afdb.zip chromium_src-bf1c37755a90bdcbda1d2b7b6dd75e2835b0afdb.tar.gz chromium_src-bf1c37755a90bdcbda1d2b7b6dd75e2835b0afdb.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/183883024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255325 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/android/dex_action.gypi | 7 | ||||
| -rwxr-xr-x | build/android/gyp/dex.py | 3 | ||||
| -rw-r--r-- | build/java_apk.gypi | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/build/android/dex_action.gypi b/build/android/dex_action.gypi index 9b640d6..7e24d1e 100644 --- a/build/android/dex_action.gypi +++ b/build/android/dex_action.gypi @@ -14,7 +14,6 @@ # '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', @@ -30,7 +29,6 @@ 'variables': { 'dex_input_paths': [], 'dex_generated_input_dirs': [], - 'input_paths': [], 'proguard_enabled%': 'false', 'proguard_enabled_input_path%': '', 'dex_no_locals%': 0, @@ -39,7 +37,6 @@ '<(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': [ @@ -53,10 +50,6 @@ '--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)', ] diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py index 1e6ca8a..c51d683 100755 --- a/build/android/gyp/dex.py +++ b/build/android/gyp/dex.py @@ -46,9 +46,6 @@ 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' diff --git a/build/java_apk.gypi b/build/java_apk.gypi index bf841fe..49e6ebe 100644 --- a/build/java_apk.gypi +++ b/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' ], }, { |