Chromium Code Reviews| Index: build/java_apk.gypi |
| diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
| index e1c2f8fc52845eb3ae36a2fe0757dfb1db25a4bd..174ec4d4da9769087ff44df5bae2de3daab58e47 100644 |
| --- a/build/java_apk.gypi |
| +++ b/build/java_apk.gypi |
| @@ -93,6 +93,7 @@ |
| # aapt generates this proguard.txt. |
| 'generated_proguard_file': '<(intermediate_dir)/proguard.txt', |
| 'proguard_enabled%': 'false', |
| + 'debug_build_proguard_enabled%': 'false', |
|
jbudorick
2015/10/19 13:24:13
I really don't like doing this separately but can
|
| 'proguard_flags_paths': ['<(generated_proguard_file)'], |
| 'jar_name': 'chromium_apk_<(_target_name).jar', |
| 'resource_dir%':'<(DEPTH)/build/android/ant/empty/res', |
| @@ -252,6 +253,11 @@ |
| 'proguard_enabled': 'true', |
| } |
| }], |
| + ['debug_build_proguard_enabled == "true"', { |
| + 'variables': { |
| + 'debug_build_proguard_enabled': 'true', |
| + } |
| + }], |
| ], |
| 'variables': { |
| 'apk_output_jar_path': '<(jar_path)', |
| @@ -1000,6 +1006,11 @@ |
| '--proguard-enabled', |
| ], |
| }], |
| + ['debug_build_proguard_enabled == "true"', { |
| + 'additional_obfuscate_options': [ |
| + '--debug-build-proguard-enabled', |
| + ], |
| + }], |
| ], |
| 'obfuscate_input_jars_paths': [ |
| '>@(input_jars_paths)', |
| @@ -1109,7 +1120,7 @@ |
| '>(tested_apk_dex_path).inputs', |
| ], |
| }], |
| - ['proguard_enabled == "true"', { |
| + ['proguard_enabled == "true" or debug_build_proguard_enabled == "true"', { |
| 'inputs': [ '<(obfuscate_stamp)' ] |
| }, { |
| 'inputs': [ '<(emma_instr_stamp)' ] |