| Index: build/android/incremental_install/create_install_script.py
|
| diff --git a/build/android/incremental_install/create_install_script.py b/build/android/incremental_install/create_install_script.py
|
| index 5040a5651fbfb0ee3ba1c13551c536b3e7b79bf7..ff8e2c1a1a2659a3de7cb82119e17deb29272524 100755
|
| --- a/build/android/incremental_install/create_install_script.py
|
| +++ b/build/android/incremental_install/create_install_script.py
|
| @@ -40,10 +40,12 @@ def GetInstallParameters():
|
| lib_dir = {lib_dir}
|
| dex_files = {dex_files}
|
| splits = {splits}
|
| + show_proguard_warning = {show_proguard_warning}
|
|
|
| return dict(apk_path=_ResolvePath(apk_path),
|
| dex_files=[_ResolvePath(p) for p in dex_files],
|
| lib_dir=_ResolvePath(lib_dir),
|
| + show_proguard_warning=show_proguard_warning,
|
| splits=[_ResolvePath(p) for p in splits])
|
|
|
|
|
| @@ -62,6 +64,8 @@ def main():
|
| for split in params['splits']:
|
| cmd_args.extend(('--split', split))
|
| cmd_args.append(params['apk_path'])
|
| + if params['show_proguard_warning']:
|
| + cmd_args.append('--show-proguard-warning')
|
| return subprocess.call(cmd_args + sys.argv[1:])
|
|
|
| if __name__ == '__main__':
|
| @@ -97,6 +101,10 @@ def _ParseArgs(args):
|
| help='List of dex files to include.')
|
| parser.add_argument('--dex-file-list',
|
| help='GYP-list of dex files.')
|
| + parser.add_argument('--show-proguard-warning',
|
| + action='store_true',
|
| + default=False,
|
| + help='Print a warning about proguard being disabled')
|
|
|
| options = parser.parse_args(args)
|
| options.dex_files += build_utils.ParseGypList(options.dex_file_list)
|
| @@ -119,6 +127,7 @@ def main(args):
|
| 'output_directory': pformat(relativize(options.output_directory)),
|
| 'lib_dir': pformat(relativize(options.lib_dir)),
|
| 'dex_files': pformat([relativize(p) for p in options.dex_files]),
|
| + 'show_proguard_warning': pformat(options.show_proguard_warning),
|
| 'splits': pformat([relativize(p) for p in options.splits]),
|
| }
|
|
|
|
|