| Index: build/android/dex_action.gypi
|
| diff --git a/build/android/dex_action.gypi b/build/android/dex_action.gypi
|
| index 56d386ffad1e74c78f6dafba6f32d8b3a69b4357..7d9638e035c25e046ee9193ae256daef90f6454d 100644
|
| --- a/build/android/dex_action.gypi
|
| +++ b/build/android/dex_action.gypi
|
| @@ -30,6 +30,8 @@
|
| 'dex_input_paths': [],
|
| 'dex_generated_input_dirs': [],
|
| 'proguard_enabled%': 'false',
|
| + # TODO(jbudorick): remove this once multidex is done.
|
| + 'debug_build_proguard_enabled%': 'false',
|
| 'proguard_enabled_input_path%': '',
|
| 'dex_no_locals%': 0,
|
| 'dex_additional_options': [],
|
| @@ -51,6 +53,7 @@
|
| '--output-directory=<(PRODUCT_DIR)',
|
| '--configuration-name=<(CONFIGURATION_NAME)',
|
| '--proguard-enabled=>(proguard_enabled)',
|
| + '--debug-build-proguard-enabled=>(debug_build_proguard_enabled)',
|
| '--proguard-enabled-input-path=<(proguard_enabled_input_path)',
|
| '--no-locals=>(dex_no_locals)',
|
| '>@(dex_additional_options)',
|
|
|