| Index: build/android/gyp/dex.py
|
| diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
|
| index d89c7c21ec1e3f811644d0f75ec76debfdd6642a..92350e19e22cd9ea1235f5827cf8d2c98d53bb04 100755
|
| --- a/build/android/gyp/dex.py
|
| +++ b/build/android/gyp/dex.py
|
| @@ -63,13 +63,13 @@ def main():
|
| and options.configuration_name == 'Release'):
|
| paths = [options.proguard_enabled_input_path]
|
|
|
| + if options.inputs:
|
| + paths += build_utils.ParseGypList(options.inputs)
|
| +
|
| if options.excluded_paths_file:
|
| exclude_paths = build_utils.ReadJson(options.excluded_paths_file)
|
| paths = [p for p in paths if not p in exclude_paths]
|
|
|
| - if options.inputs:
|
| - paths += build_utils.ParseGypList(options.inputs)
|
| -
|
| DoDex(options, paths)
|
|
|
| if options.depfile:
|
|
|