Commit 6ea248d7 authored by Brad Lassey's avatar Brad Lassey Committed by Commit Bot

Consistently enable brotli in Cronet iOS builds

Bug: 737231
Change-Id: Id6f45920f7dae7e185da6b663f3bc0cfb8073cc3
Reviewed-on: https://chromium-review.googlesource.com/568856
Commit-Queue: Brad Lassey <lassey@chromium.org>
Reviewed-by: default avatarMisha Efimov <mef@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486434}
parent 88e6a179
...@@ -100,7 +100,7 @@ def package_ios_framework_using_gn(out_dir='out/Framework', extra_options=''): ...@@ -100,7 +100,7 @@ def package_ios_framework_using_gn(out_dir='out/Framework', extra_options=''):
'is_cronet_build=true is_component_build=false ' \ 'is_cronet_build=true is_component_build=false ' \
'disable_file_support=true disable_ftp_support=true ' \ 'disable_file_support=true disable_ftp_support=true ' \
'use_platform_icu_alternatives=true ' \ 'use_platform_icu_alternatives=true ' \
'disable_brotli_filter=true enable_dsyms=true ' \ 'disable_brotli_filter=false enable_dsyms=true ' \
'target_cpu="%s" additional_target_cpus = ["%s"] %s' % \ 'target_cpu="%s" additional_target_cpus = ["%s"] %s' % \
(target_cpu, additional_cpu, gn_extra_args) (target_cpu, additional_cpu, gn_extra_args)
...@@ -177,7 +177,7 @@ def main(): ...@@ -177,7 +177,7 @@ def main():
gyp_defines = 'GYP_DEFINES="OS=ios enable_websockets=0 '+ \ gyp_defines = 'GYP_DEFINES="OS=ios enable_websockets=0 '+ \
'disable_file_support=1 disable_ftp_support=1 '+ \ 'disable_file_support=1 disable_ftp_support=1 '+ \
'enable_errorprone=1 disable_brotli_filter=1 chromium_ios_signing=0 ' + \ 'enable_errorprone=1 disable_brotli_filter=0 chromium_ios_signing=0 ' + \
'target_subarch=both ' + use_platform_icu_alternatives + '"' 'target_subarch=both ' + use_platform_icu_alternatives + '"'
if not options.gn: if not options.gn:
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"xcode version": "8.0", "xcode version": "8.0",
"gn_args": [ "gn_args": [
"additional_target_cpus=[\"x86\"]", "additional_target_cpus=[\"x86\"]",
"disable_brotli_filter=true", "disable_brotli_filter=false",
"disable_file_support=true", "disable_file_support=true",
"disable_ftp_support=true", "disable_ftp_support=true",
"enable_websockets=false", "enable_websockets=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