| Index: build/android/gyp/dex.py
|
| diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
|
| index 59425d705955f8116f23fbceea332f933191cb6e..67f43e94d7903f27dbf48d3eb3b37346b4c62b2a 100755
|
| --- a/build/android/gyp/dex.py
|
| +++ b/build/android/gyp/dex.py
|
| @@ -49,6 +49,8 @@ def _ParseArgs(args):
|
| help='The build CONFIGURATION_NAME.')
|
| parser.add_option('--proguard-enabled',
|
| help='"true" if proguard is enabled.')
|
| + parser.add_option('--debug-build-proguard-enabled',
|
| + help='"true" if proguard is enabled for debug build.')
|
| parser.add_option('--proguard-enabled-input-path',
|
| help=('Path to dex in Release mode when proguard '
|
| 'is enabled.'))
|
| @@ -144,8 +146,10 @@ def _OnStaleMd5(changes, options, dex_cmd, paths):
|
|
|
| def main(args):
|
| options, paths = _ParseArgs(args)
|
| - if (options.proguard_enabled == 'true'
|
| - and options.configuration_name == 'Release'):
|
| + if ((options.proguard_enabled == 'true'
|
| + and options.configuration_name == 'Release')
|
| + or (options.debug_build_proguard_enabled == 'true'
|
| + and options.configuration_name == 'Debug')):
|
| paths = [options.proguard_enabled_input_path]
|
|
|
| if options.inputs:
|
|
|