diff options
Diffstat (limited to 'build')
| -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, 11 insertions, 1 deletions
diff --git a/build/android/dex_action.gypi b/build/android/dex_action.gypi index 7e24d1e..9b640d6 100644 --- a/build/android/dex_action.gypi +++ b/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)', ] diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py index c51d683..1e6ca8a 100755 --- a/build/android/gyp/dex.py +++ b/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' diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 49e6ebe..bf841fe 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' ], }, { |