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

[Cronet] Enable reporting feature on Android.

Bug: 828899
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I14000553e3164529bcf11d7aadf38ceb8f76c01e
Reviewed-on: https://chromium-review.googlesource.com/995636Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarJulia Tuttle <juliatuttle@chromium.org>
Reviewed-by: default avatarPaul Jensen <pauljensen@chromium.org>
Commit-Queue: Misha Efimov <mef@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548347}
parent 384e8008
......@@ -92,12 +92,12 @@ def main():
print options
print extra_options_list
is_os = (sys.platform == 'darwin')
if is_os:
is_ios = (sys.platform == 'darwin')
if is_ios:
target_os = 'ios'
test_target = 'cronet_test'
unit_target = 'cronet_unittests_ios'
gn_args = 'is_cronet_build=true is_component_build=false ' \
gn_args = 'is_cronet_build=true enable_reporting=false ' \
'use_xcode_clang=true ios_deployment_target="9.0" '
gn_extra = '--ide=xcode'
if options.iphoneos:
......@@ -113,7 +113,7 @@ def main():
target_os = 'android'
test_target = 'cronet_test_instrumentation_apk'
unit_target = 'cronet_unittests_android'
gn_args = 'use_errorprone_java_compiler=true '
gn_args = 'use_errorprone_java_compiler=true enable_reporting=true '
gn_extra = ''
out_dir_suffix = ''
if options.x86:
......@@ -131,7 +131,6 @@ def main():
'disable_file_support=true disable_ftp_support=true '+ \
'disable_brotli_filter=false ' + \
'use_platform_icu_alternatives=true '+ \
'enable_reporting=false '+ \
'is_component_build=false ' + \
'use_crash_key_stubs=true ' + \
'ignore_elf32_limitations=true use_partition_alloc=false ' + \
......@@ -156,7 +155,7 @@ def main():
return run ('git pull --rebase && gclient sync')
if (options.command=='build'):
return build(out_dir, test_target, extra_options)
if (not is_os):
if (not is_ios):
if (options.command=='install'):
return install(out_dir)
if (options.command=='proguard'):
......
......@@ -1829,7 +1829,7 @@
'cronet': {
'gn_args': ('disable_file_support=true disable_ftp_support=true '
'enable_websockets=false use_platform_icu_alternatives=true '
'use_partition_alloc=false enable_reporting=false '
'use_partition_alloc=false enable_reporting=true '
'include_transport_security_state_preload_list=false '
'use_crash_key_stubs=true '
'clang_use_default_sample_profile=false'),
......
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