Commit ddb201c7 authored by Misha Efimov's avatar Misha Efimov Committed by Commit Bot

[Cronet] Fix cr_cronet.py script.

The cr_cronet.py script got broken by https://chromium-review.googlesource.com/c/chromium/src/+/1273824.
This change fixes it.

Bug: 786559
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;master.tryserver.chromium.android:android_cronet_tester
Change-Id: Ic71a1eee5041a27bfe51d706e7d16a4d83c6ee7e
Reviewed-on: https://chromium-review.googlesource.com/c/1286739Reviewed-by: default avatarPaul Jensen <pauljensen@chromium.org>
Commit-Queue: Misha Efimov <mef@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600533}
parent d7822353
......@@ -61,14 +61,14 @@ def stack(out_dir):
' third_party/android_platform/development/scripts/stack')
def use_goma:
def use_goma():
home_goma = os.path.expanduser("~/goma")
if os.path.exists(home_goma) or os.environ.get("GOMA_DIR") or \
os.environ.get("GOMADIR"):
return 'use_goma=true '
return ''
def gn_args(target_os, is_release):
def gn_args_default(target_os, is_release):
gn_args = 'target_os="' + target_os + '" enable_websockets=false '+ \
'disable_file_support=true disable_ftp_support=true '+ \
'disable_brotli_filter=false ' + \
......@@ -82,7 +82,7 @@ def gn_args(target_os, is_release):
def gn_args_mac(is_release):
return gn_args('mac', is_release) + \
return gn_args_default('mac', is_release) + \
'disable_histogram_support=true ' + \
'use_platform_icu_alternatives=false ' + \
'enable_dsyms=true '
......@@ -153,7 +153,7 @@ def main():
gn_args += 'is_asan=true is_clang=true is_debug=false '
out_dir_suffix += '-asan'
gn_args += gn_args(target_os, options.release) + \
gn_args += gn_args_default(target_os, options.release) + \
'use_platform_icu_alternatives=true '
extra_options = ' '.join(extra_options_list)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment