Chromium Code Reviews| Index: components/cronet/tools/cr_cronet.py |
| diff --git a/components/cronet/tools/cr_cronet.py b/components/cronet/tools/cr_cronet.py |
| index 7d87b6ce4a0596d9c118c941283b193d9bd44a8a..994cd415fca03c904ea42aeeb5c665e919c63138 100755 |
| --- a/components/cronet/tools/cr_cronet.py |
| +++ b/components/cronet/tools/cr_cronet.py |
| @@ -51,6 +51,7 @@ def main(): |
| parser = argparse.ArgumentParser() |
| parser.add_argument('command', |
| choices=['gyp', |
| + 'gn', |
| 'sync', |
| 'build', |
| 'install', |
| @@ -67,16 +68,23 @@ def main(): |
| print options |
| print extra_options_list |
| gyp_defines = 'GYP_DEFINES="OS=android enable_websockets=0 '+ \ |
| - 'disable_file_support=1 disable_ftp_support=1" ' |
| + 'disable_file_support=1 disable_ftp_support=1 '+ \ |
| + 'enable_bidirectional_stream=1"' |
| + gn_args = 'target_os="android" enable_websockets=false '+ \ |
| + 'disable_file_support=true disable_ftp_support=true '+ \ |
| + 'enable_bidirectional_stream=true use_goma=true' |
|
pauljensen
2016/01/12 16:55:42
does this work without Goma? I never use Goma
mef
2016/01/14 21:07:55
You should give it a try, it is great. :) Removed.
|
| out_dir = 'out/Debug' |
| release_arg = '' |
| extra_options = ' '.join(extra_options_list) |
| if options.release: |
| out_dir = 'out/Release' |
| release_arg = ' --release' |
| + gn_args += ' is_debug=false ' |
| if (options.command=='gyp'): |
| return run (gyp_defines + ' gclient runhooks') |
| + if (options.command=='gn'): |
| + return run ('gn gen ' + out_dir + ' --args=\'' + gn_args + '\'') |
| if (options.command=='sync'): |
| return run ('git pull --rebase && ' + gyp_defines + ' gclient sync') |
| if (options.command=='build'): |